diff --git a/src/emsesp.cpp b/src/emsesp.cpp
index e7a00a55d..4a2b33c4d 100644
--- a/src/emsesp.cpp
+++ b/src/emsesp.cpp
@@ -1016,7 +1016,7 @@ bool EMSESP::add_device(const uint8_t device_id, const uint8_t product_id, std::
         F_(entities_cmd));
 
     // MQTT subscribe to the device top-level, e.g. "ems-esp/boiler" and subs
-    std::string topic = EMSdevice::device_type_2_device_name(device_type) + "#";
+    std::string topic = EMSdevice::device_type_2_device_name(device_type) + "/#";
     Mqtt::subscribe(device_type, topic, nullptr); // use empty function callback
 
     // Print to LOG showing we've added a new device
diff --git a/src/system.cpp b/src/system.cpp
index 52b1196da..9d3a0a69e 100644
--- a/src/system.cpp
+++ b/src/system.cpp
@@ -699,8 +699,9 @@ void System::commands_init() {
     Command::add(EMSdevice::DeviceType::SYSTEM, F("test"), System::command_test, F("run tests"));
 #endif
 
-    // MQTT subscribe "ems-esp/system" and subs
-    Mqtt::subscribe(EMSdevice::DeviceType::SYSTEM, "system#", nullptr); // use empty function callback
+    // MQTT subscribe "ems-esp/system/#"
+    // There is no need to subscribe only to 'ems-esp/system' as the commands send and pin require the fullpath for security
+    Mqtt::subscribe(EMSdevice::DeviceType::SYSTEM, "system/#", nullptr); // use empty function callback
 }
 
 // flashes the LED