diff --git a/CHANGELOG_LATEST.md b/CHANGELOG_LATEST.md
index 1ebf139d2..1e0d3f44d 100644
--- a/CHANGELOG_LATEST.md
+++ b/CHANGELOG_LATEST.md
@@ -5,6 +5,7 @@
 ## Added
 
 ## Fixed
+- lastcode broke MQTT JSON structure [#228]
 
 ## Changed
 
diff --git a/src/devices/boiler.cpp b/src/devices/boiler.cpp
index 35a1fdbef..c942f5009 100644
--- a/src/devices/boiler.cpp
+++ b/src/devices/boiler.cpp
@@ -815,10 +815,11 @@ void Boiler::process_UBAErrorMessage(std::shared_ptr<const Telegram> telegram) {
 
 // 0xC2
 void Boiler::process_UBAErrorMessage2(std::shared_ptr<const Telegram> telegram) {
-    // not sure why this test is in , so removing
-    // if (telegram->offset > 0 || telegram->message_length < 14) {
-    //     return;
-    // }
+    // for decoding "last error code" we need telegram starting with offset 0
+    if (telegram->offset != 0 || telegram->message_length < 20) {
+         return;
+    }
+
     char     code[4];
     uint16_t codeNo;
     char     start_time[17];