diff --git a/Core/NES/Mappers/Homebrew/RainbowESP.cpp b/Core/NES/Mappers/Homebrew/RainbowESP.cpp
index a7cc1521a..fed785460 100644
--- a/Core/NES/Mappers/Homebrew/RainbowESP.cpp
+++ b/Core/NES/Mappers/Homebrew/RainbowESP.cpp
@@ -553,11 +553,19 @@ void BrokeStudioFirmware::processBufferedMessage()
 			if(message_size == 1) {
 				this->tx_messages.push_back({
 					2,
-					static_cast<uint8_t>(fromesp_cmds_t::NETWORK_COUNT),
+					static_cast<uint8_t>(fromesp_cmds_t::NETWORK_SCAN_RESULT),
 					NUM_FAKE_NETWORKS
 				});
 			}
 			break;
+		case toesp_cmds_t::NETWORK_GET_SCAN_RESULT:
+			UDBG("[Rainbow] ESP received command NETWORK_GET_SCAN_RESULT");
+			this->tx_messages.push_back({
+				2,
+				static_cast<uint8_t>(fromesp_cmds_t::NETWORK_SCAN_RESULT),
+				NUM_FAKE_NETWORKS
+			});
+			break;
 		case toesp_cmds_t::NETWORK_GET_DETAILS:
 			UDBG("[Rainbow] ESP received command NETWORK_GET_DETAILS");
 			if(message_size == 2) {
@@ -828,9 +836,9 @@ void BrokeStudioFirmware::processBufferedMessage()
 			if(message_size >= 2 && message_size <= 5) {
 				if(this->working_file.active) {
 					this->working_file.offset = this->rx_buffer.at(2);
-					if(message_size == 3) this->working_file.offset += static_cast<uint32_t>(message_size >= 3 ? this->rx_buffer.at(3) : 0) << 8;
-					if(message_size == 4) this->working_file.offset += static_cast<uint32_t>(message_size >= 4 ? this->rx_buffer.at(4) : 0) << 16;
-					if(message_size == 5) this->working_file.offset += static_cast<uint32_t>(message_size >= 5 ? this->rx_buffer.at(5) : 0) << 24;
+					if(message_size == 3) this->working_file.offset += this->rx_buffer.at(3) << 8;
+					if(message_size == 4) this->working_file.offset += this->rx_buffer.at(4) << 16;
+					if(message_size == 5) this->working_file.offset += this->rx_buffer.at(5) << 24;
 				}
 			}
 			break;
diff --git a/Core/NES/Mappers/Homebrew/RainbowESP.h b/Core/NES/Mappers/Homebrew/RainbowESP.h
index a4adc7562..c827bdfde 100644
--- a/Core/NES/Mappers/Homebrew/RainbowESP.h
+++ b/Core/NES/Mappers/Homebrew/RainbowESP.h
@@ -137,6 +137,7 @@ class BrokeStudioFirmware
 
 		// NETWORK CMDS
 		NETWORK_SCAN,
+		NETWORK_GET_SCAN_RESULT,
 		NETWORK_GET_DETAILS,
 		NETWORK_GET_REGISTERED,
 		NETWORK_GET_REGISTERED_DETAILS,
@@ -189,7 +190,7 @@ class BrokeStudioFirmware
 		MESSAGE_FROM_SERVER,
 
 		// NETWORK CMDS
-		NETWORK_COUNT,
+		NETWORK_SCAN_RESULT,
 		NETWORK_SCANNED_DETAILS,
 		NETWORK_REGISTERED_DETAILS,
 		NETWORK_REGISTERED,