diff --git a/include/language/en-US.hpp b/include/language/en-US.hpp
index 72ec652e..f2d720ff 100644
--- a/include/language/en-US.hpp
+++ b/include/language/en-US.hpp
@@ -47,8 +47,6 @@ namespace fabomatic::strings::en_US
   inline constexpr auto S_HW_ERROR = "HW error";
   inline constexpr auto S_PORTAL_ERROR = "Portal error";
   inline constexpr auto S_OTA_ERROR = "OTA error";
-  inline constexpr auto S_STATUS_ERROR_1 = "Unhandled status";
-  inline constexpr auto S_STATUS_ERROR_2 = "value";
 
   inline constexpr auto S_PORTAL_SUCCESS = "WiFi conf. OK";
   inline constexpr auto S_OPEN_PORTAL = "Open portal";
diff --git a/include/language/it-IT.hpp b/include/language/it-IT.hpp
index 7dc2d55a..2ce57afd 100644
--- a/include/language/it-IT.hpp
+++ b/include/language/it-IT.hpp
@@ -47,8 +47,6 @@ namespace fabomatic::strings::it_IT
   inline constexpr auto S_HW_ERROR = "Errore HW";
   inline constexpr auto S_PORTAL_ERROR = "Errore portale";
   inline constexpr auto S_OTA_ERROR = "Errore OTA";
-  inline constexpr auto S_STATUS_ERROR_1 = "Unhandled status";
-  inline constexpr auto S_STATUS_ERROR_2 = "value";
 
   inline constexpr auto S_PORTAL_SUCCESS = "Conf. WiFi OK";
   inline constexpr auto S_OPEN_PORTAL = "Apri portale";
diff --git a/src/BoardLogic.cpp b/src/BoardLogic.cpp
index 13e90334..03a98243 100644
--- a/src/BoardLogic.cpp
+++ b/src/BoardLogic.cpp
@@ -418,11 +418,6 @@ namespace fabomatic
       lcd.setRow(0, strings::S_OTA_ERROR);
       lcd.setRow(1, "");
       break;
-    default:
-      lcd.setRow(0, strings::S_STATUS_ERROR_1);
-      buffer << strings::S_STATUS_ERROR_2 << static_cast<int>(status);
-      lcd.setRow(1, buffer.str());
-      break;
     }
     BoardInfo bi = {server.isOnline(), machine.getPowerState(), machine.isShutdownImminent(), !server.isResponsive()};
     lcd.update(bi, false);
diff --git a/src/mock/MockMQTTBroker.cpp b/src/mock/MockMQTTBroker.cpp
index 9e9dd654..cc13f916 100644
--- a/src/mock/MockMQTTBroker.cpp
+++ b/src/mock/MockMQTTBroker.cpp
@@ -96,9 +96,6 @@ namespace fabomatic
       ESP_LOGD(TAG2, "MQTT BROKER: got unsubscribe from %s", e->Topic().c_str());
     }
     break;
-    default:
-      ESP_LOGD(TAG2, "MQTT BROKER: unhandled event %d", event->Type());
-      break;
     }
     return true;
   }