diff --git a/code/espurna/rfbridge.ino b/code/espurna/rfbridge.ino
index 7f2f0532..6060aca7 100644
--- a/code/espurna/rfbridge.ino
+++ b/code/espurna/rfbridge.ino
@@ -92,10 +92,11 @@ void _rfbWebSocketSendCodes() {
     DynamicJsonBuffer jsonBuffer;
     JsonObject& root = jsonBuffer.createObject();
 
-    root["size"] = relayCount();
+    JsonObject& rfb = root.createObject("rfb");
+    rfb["size"] = relayCount();
 
-    JsonArray& on = root.createNestedArray("on");
-    JsonArray& off = root.createNestedArray("off");
+    JsonArray& on = rfb.createNestedArray("on");
+    JsonArray& off = rfb.createNestedArray("off");
 
     for (byte id=0; id<relayCount(); id++) {
         on.add(rfbRetrieve(id, true));
diff --git a/code/html/custom.js b/code/html/custom.js
index 94ce77b7..59ee6e6f 100644
--- a/code/html/custom.js
+++ b/code/html/custom.js
@@ -1218,8 +1218,8 @@ function processData(data) {
             var rfb = data.rfb;
             var size = data.size;
 
-            var on = rfb[0];
-            var off = rfb[1];
+            var on = rfb["on"];
+            var off = rfb["off"];
 
             for (var i=0; i<size; ++i) {
                 $("input[name='rfbcode'][data-id='" + i + "'][data-status='1']").val(on[i]);