diff --git a/src/devices/solar.cpp b/src/devices/solar.cpp
index 2edb644d3..32e81cae9 100644
--- a/src/devices/solar.cpp
+++ b/src/devices/solar.cpp
@@ -315,9 +315,12 @@ void Solar::process_SM100SolarCircuitConfig(std::shared_ptr<const Telegram> tele
  * e.g. B0 0B F9 00 00 02 5A 00 00 6E
  */
 void Solar::process_SM100ParamCfg(std::shared_ptr<const Telegram> telegram) {
-    uint16_t t_id;
-    uint8_t  of;
-    int32_t  min, def, max, cur;
+    uint16_t t_id = EMS_VALUE_USHORT_NOTSET;
+    uint8_t  of   = EMS_VALUE_UINT_NOTSET;
+    int32_t  min  = EMS_VALUE_USHORT_NOTSET;
+    int32_t  def  = EMS_VALUE_USHORT_NOTSET;
+    int32_t  max  = EMS_VALUE_USHORT_NOTSET;
+    int32_t  cur  = EMS_VALUE_USHORT_NOTSET;
     has_update(telegram->read_value(t_id, 1));
     has_update(telegram->read_value(of, 3));
     has_update(telegram->read_value(min, 5));
diff --git a/src/devices/thermostat.cpp b/src/devices/thermostat.cpp
index f80bcf45f..b817a30ef 100644
--- a/src/devices/thermostat.cpp
+++ b/src/devices/thermostat.cpp
@@ -1096,7 +1096,7 @@ void Thermostat::process_RCErrorMessage(std::shared_ptr<const Telegram> telegram
     // data: displaycode(2), errornumber(2), year, month, hour, day, minute, duration(2), src-addr
     if (telegram->message_data[4] & 0x80) { // valid date
         char     code[3];
-        uint16_t codeNo;
+        uint16_t codeNo = EMS_VALUE_USHORT_NOTSET;
         code[0] = telegram->message_data[0];
         code[1] = telegram->message_data[1];
         code[2] = 0;