diff --git a/src/emsdevice.cpp b/src/emsdevice.cpp
index 29104e414..fd6b32e39 100644
--- a/src/emsdevice.cpp
+++ b/src/emsdevice.cpp
@@ -157,6 +157,14 @@ uint8_t EMSdevice::device_name_2_device_type(const char * topic) {
         return DeviceType::ANALOGSENSOR;
     }
 
+    if (!strcmp(lowtopic, F_(switch))) {
+        return DeviceType::SWITCH;
+    }
+
+    if (!strcmp(lowtopic, F_(gateway))) {
+        return DeviceType::GATEWAY;
+    }
+
     return DeviceType::UNKNOWN;
 }