diff --git a/src/mqtt/hasp_mqtt_paho_single.cpp b/src/mqtt/hasp_mqtt_paho_single.cpp
index a5ca8dc9..84fc0fba 100644
--- a/src/mqtt/hasp_mqtt_paho_single.cpp
+++ b/src/mqtt/hasp_mqtt_paho_single.cpp
@@ -84,7 +84,7 @@ bool mqttHAautodiscover = true;
 #define MQTT_NODENAME "";
 #endif
 #ifndef MQTT_GROUPNAME
-#define MQTT_GROUPNAME "";
+#define MQTT_GROUPNAME "plates";
 #endif
 
 #ifndef MQTT_PREFIX
@@ -258,14 +258,19 @@ static void onConnect(void* context)
 {
     MQTTClient client = (MQTTClient)context;
     connected         = 1;
+    std::string topic;
 
     LOG_VERBOSE(TAG_MQTT, "Successful connection");
 
-    std::string topic;
+    topic = mqttGroupTopic + "command/#";
+    mqtt_subscribe(mqtt_client, topic.c_str());
 
     topic = mqttNodeTopic + "command/#";
     mqtt_subscribe(mqtt_client, topic.c_str());
 
+    topic = mqttGroupTopic + "config/#";
+    mqtt_subscribe(mqtt_client, topic.c_str());
+
     topic = mqttNodeTopic + "config/#";
     mqtt_subscribe(mqtt_client, topic.c_str());