diff --git a/examples/esp8266/WebSocketClientOTA/WebSocketClientOTA.ino b/examples/esp8266/WebSocketClientOTA/WebSocketClientOTA.ino
index 2c87c25..6a809c0 100644
--- a/examples/esp8266/WebSocketClientOTA/WebSocketClientOTA.ino
+++ b/examples/esp8266/WebSocketClientOTA/WebSocketClientOTA.ino
@@ -117,6 +117,10 @@ void STATE(JsonDocument &msg){
     // Do something with message
 }
 
+// Count of responses handled by RESPONSES_STRUCT
+// increase increase if another response handler is added
+int nrOfResponses = 2;
+
 RESPONSES_STRUCT responses[] = {
   {"ota",           OTA},
   {"state",      STATE},
@@ -145,7 +149,7 @@ void text(uint8_t * payload, size_t length){
     // Handle each TYPE of message
     int b = 0;
 
-    for( b=0 ; strlen(responses[b].type) ; b++ )
+    for( b=0 ; b<nrOfResponses ; b++ )
     {
         if( strncmp(doc_in["type"], responses[b].type, strlen(responses[b].type)) == 0 ) {
             responses[b].func(doc_in);
diff --git a/examples/esp8266/WebSocketClientOTA/python_ota_server/main.py b/examples/esp8266/WebSocketClientOTA/python_ota_server/main.py
index 174e2d3..1c1c5b6 100644
--- a/examples/esp8266/WebSocketClientOTA/python_ota_server/main.py
+++ b/examples/esp8266/WebSocketClientOTA/python_ota_server/main.py
@@ -163,7 +163,7 @@ async def _register(websocket, message):
     Logger.info("Client(%s) mac: %s", name, mac)
     # Some code
 
-    response = {'response_type': 'registry', 'state': 'ok'}
+    response = {'type': 'registry', 'state': 'ok'}
     await websocket.send(json.dumps(response))
 
 
@@ -173,13 +173,13 @@ async def _state(websocket, message):
     Logger.info("Client(%s) mac: %s", name, mac)
     # Some code
 
-    response = {'response_type': 'state', 'state': 'ok'}
+    response = {'type': 'state', 'state': 'ok'}
     await websocket.send(json.dumps(response))
 
 
 async def _unhandleld(websocket, msg):
     Logger.info("Unhandled message from device: %s", str(msg))
-    response = {'response_type': 'response', 'state': 'nok'}
+    response = {'type': 'response', 'state': 'nok'}
     await websocket.send(json.dumps(response))