diff --git a/core/MyGatewayTransportEthernet.cpp b/core/MyGatewayTransportEthernet.cpp
index cef41e7..299e339 100644
--- a/core/MyGatewayTransportEthernet.cpp
+++ b/core/MyGatewayTransportEthernet.cpp
@@ -272,19 +272,23 @@ bool gatewayTransportAvailable()
 
 		if (packet_size) {
 			//debug(PSTR("UDP packet available. Size:%d\n"), packet_size);
-            setIndication(INDICATION_GW_RX);
 			#if defined(MY_GATEWAY_ESP8266)
 				_ethernetServer.read(inputString[0].string, MY_GATEWAY_MAX_RECEIVE_LENGTH);
 				inputString[0].string[packet_size] = 0;
 				debug(PSTR("UDP packet received: %s\n"), inputString[0].string);
-				return protocolParse(_ethernetMsg, inputString[0].string);
+				const bool ok = protocolParse(_ethernetMsg, inputString[0].string);
 			#else
 				_ethernetServer.read(inputString.string, MY_GATEWAY_MAX_RECEIVE_LENGTH);
 				inputString.string[packet_size] = 0;
 				debug(PSTR("UDP packet received: %s\n"), inputString.string);
 				_w5100_spi_en(false);
-				return protocolParse(_ethernetMsg, inputString.string);
+				const bool ok = protocolParse(_ethernetMsg, inputString.string);
 			#endif
+            if (ok)
+            {
+                setIndication(INDICATION_GW_RX);
+            }
+            return ok;
 		}
 	#else
 		#if defined(MY_GATEWAY_ESP8266)
diff --git a/core/MyGatewayTransportMQTTClient.cpp b/core/MyGatewayTransportMQTTClient.cpp
index b6ca377..a385382 100644
--- a/core/MyGatewayTransportMQTTClient.cpp
+++ b/core/MyGatewayTransportMQTTClient.cpp
@@ -131,6 +131,7 @@ void incomingMQTT(char* topic, byte* payload, unsigned int length) {
 				_MQTT_msg.set((const char*)payload);
 			}
 			_MQTT_available = true;
+            setIndication(INDICATION_GW_RX);
 		}
 		}
 		i++;
diff --git a/core/MyGatewayTransportSerial.cpp b/core/MyGatewayTransportSerial.cpp
index bbad4b3..74a118e 100644
--- a/core/MyGatewayTransportSerial.cpp
+++ b/core/MyGatewayTransportSerial.cpp
@@ -58,7 +58,11 @@ bool gatewayTransportAvailable() {
 			if (inChar == '\n') {
 				_serialInputString[_serialInputPos] = 0;
 				bool ok = protocolParse(_serialMsg, _serialInputString);
-				_serialInputPos = 0;
+                if (ok)
+                {
+                    setIndication(INDICATION_GW_RX);
+                }
+                _serialInputPos = 0;
 				return ok;
 			} else {
 				// add it to the inputString: