diff --git a/src/emsdevice.cpp b/src/emsdevice.cpp
index 20235d83d..68bd3116c 100644
--- a/src/emsdevice.cpp
+++ b/src/emsdevice.cpp
@@ -477,19 +477,19 @@ void EMSdevice::add_device_value(uint8_t               tag,
     if (type == DeviceValueType::STRING) {
         *(char *)(value_p) = {'\0'}; // this is important for string functions like strlen() to work later
     } else if (type == DeviceValueType::INT) {
-        *(int8_t *)(value_p) = System::test_set_all_active() ? 11 : EMS_VALUE_DEFAULT_INT;
+        *(int8_t *)(value_p) = System::test_set_all_active() ? EMS_VALUE_DEFAULT_INT_DUMMY : EMS_VALUE_DEFAULT_INT;
     } else if (type == DeviceValueType::UINT) {
-        *(uint8_t *)(value_p) = System::test_set_all_active() ? -12 : EMS_VALUE_DEFAULT_UINT;
+        *(uint8_t *)(value_p) = System::test_set_all_active() ? EMS_VALUE_DEFAULT_UINT_DUMMY : EMS_VALUE_DEFAULT_UINT;
     } else if (type == DeviceValueType::SHORT) {
-        *(int16_t *)(value_p) = System::test_set_all_active() ? -1234 : EMS_VALUE_DEFAULT_SHORT;
+        *(int16_t *)(value_p) = System::test_set_all_active() ? EMS_VALUE_DEFAULT_SHORT_DUMMY : EMS_VALUE_DEFAULT_SHORT;
     } else if (type == DeviceValueType::USHORT) {
-        *(uint16_t *)(value_p) = System::test_set_all_active() ? 1234 : EMS_VALUE_DEFAULT_USHORT;
+        *(uint16_t *)(value_p) = System::test_set_all_active() ? EMS_VALUE_DEFAULT_USHORT_DUMMY : EMS_VALUE_DEFAULT_USHORT;
     } else if ((type == DeviceValueType::ULONG) || (type == DeviceValueType::TIME)) {
-        *(uint32_t *)(value_p) = System::test_set_all_active() ? 12356 : EMS_VALUE_DEFAULT_ULONG;
+        *(uint32_t *)(value_p) = System::test_set_all_active() ? EMS_VALUE_DEFAULT_ULONG_DUMMY : EMS_VALUE_DEFAULT_ULONG;
     } else if (type == DeviceValueType::BOOL) {
-        *(int8_t *)(value_p) = System::test_set_all_active() ? 1 : EMS_VALUE_DEFAULT_BOOL; // bool is uint8_t, but other initial value
+        *(int8_t *)(value_p) = System::test_set_all_active() ? EMS_VALUE_DEFAULT_BOOL_DUMMY : EMS_VALUE_DEFAULT_BOOL; // bool is uint8_t, but other initial value
     } else if (type == DeviceValueType::ENUM) {
-        *(uint8_t *)(value_p) = System::test_set_all_active() ? 1 : EMS_VALUE_DEFAULT_ENUM; // enums behave as uint8_t
+        *(uint8_t *)(value_p) = System::test_set_all_active() ? EMS_VALUE_DEFAULT_ENUM_DUMMY : EMS_VALUE_DEFAULT_ENUM; // enums behave as uint8_t
     }
 
     uint8_t     state           = DeviceValueState::DV_DEFAULT; // determine state
diff --git a/src/telegram.h b/src/telegram.h
index 142fd0fac..6262d020e 100644
--- a/src/telegram.h
+++ b/src/telegram.h
@@ -59,6 +59,15 @@ static constexpr uint8_t EMS_MAX_TELEGRAM_MESSAGE_LENGTH = 27; // max length of
 #define EMS_VALUE_DEFAULT_BOOL EMS_VALUE_BOOL_NOTSET
 #define EMS_VALUE_DEFAULT_ENUM EMS_VALUE_UINT_NOTSET
 
+// used when System::test_set_all_active() is set
+#define EMS_VALUE_DEFAULT_INT_DUMMY 11
+#define EMS_VALUE_DEFAULT_UINT_DUMMY -12
+#define EMS_VALUE_DEFAULT_SHORT_DUMMY -1234
+#define EMS_VALUE_DEFAULT_USHORT_DUMMY 1235
+#define EMS_VALUE_DEFAULT_ULONG_DUMMY 12456
+#define EMS_VALUE_DEFAULT_BOOL_DUMMY 1
+#define EMS_VALUE_DEFAULT_ENUM_DUMMY 1
+
 namespace emsesp {
 
 class Telegram {