diff --git a/src/ems.cpp b/src/ems.cpp
index 9fd34f734..b5589785b 100644
--- a/src/ems.cpp
+++ b/src/ems.cpp
@@ -1922,10 +1922,11 @@ void _addDevice(uint8_t model_type, uint8_t src, uint8_t product_id, char * vers
 /**
  * type 0x07 - shows us the connected EMS devices
  * e.g. 08 00 07 00 0B 80 00 00 00 00 00 00 00 00 00 00 00 (CRC=47) #data=13  
+ * Junkers is 15 (I think)
  */
 void _process_UBADevices(_EMS_RxTelegram * EMS_RxTelegram) {
-    if (EMS_RxTelegram->data_length != EMS_SYS_DEVICEMAP_LENGTH) {
-        return; // should be 13 bytes long
+    if (EMS_RxTelegram->data_length > EMS_SYS_DEVICEMAP_LENGTH) {
+        return; // should be 13 or 15 bytes long
     }
 
     for (uint8_t data_byte = 0; data_byte < EMS_RxTelegram->data_length; data_byte++) {
diff --git a/src/ems.h b/src/ems.h
index 46720d9a1..4e9836137 100644
--- a/src/ems.h
+++ b/src/ems.h
@@ -121,7 +121,7 @@
 //#define EMS_SYS_LOGGING_DEFAULT EMS_SYS_LOGGING_VERBOSE // turn on for debugging
 #define EMS_SYS_LOGGING_DEFAULT EMS_SYS_LOGGING_NONE
 
-#define EMS_SYS_DEVICEMAP_LENGTH 13 // size of the 0x07 telegram data part which stores all active EMS devices
+#define EMS_SYS_DEVICEMAP_LENGTH 15 // size of the 0x07 telegram data part which stores all active EMS devices
 
 // define the model types
 // which get rendered to html colors in the web interface in file custom.js in function listCustomStats()