diff --git a/src/communication.h b/src/communication.h
index b6436e3..8350a22 100644
--- a/src/communication.h
+++ b/src/communication.h
@@ -22,7 +22,6 @@ typedef struct {
 } ButtonMessage;
 
 PicoMQTT::Server mqtt;
-PicoMQTT::ServerLocalSubscribe localsubscribe;
 
 
 void readButtonJSON(const char * topic, const char * payload) {
diff --git a/src/wificlass.h b/src/wificlass.h
index 3f0967a..be7ba6f 100644
--- a/src/wificlass.h
+++ b/src/wificlass.h
@@ -9,7 +9,7 @@
 #include "master.h"
 #include "licenceing.h"
 
-const char* ssidAP = "AquaCross-Timer";
+String ssidAP;
 const char* passwordAP = nullptr;
 
 const char* ssidSTA = "Obiwlankenobi";
@@ -20,8 +20,10 @@ PrettyOTA      OTAUpdates;
 
 void setupWifi() {
 
+    ssidAP = getUniqueSSID();
+
     WiFi.mode(WIFI_MODE_APSTA);
-    WiFi.softAP(ssidAP, passwordAP);
+    WiFi.softAP(ssidAP.c_str(), passwordAP);
     WiFi.begin(ssidSTA, passwordSTA);
  
     while (WiFi.status() != WL_CONNECTED) {
@@ -60,6 +62,16 @@ void setupOTA(AsyncWebServer *server) {
     PRETTY_OTA_SET_CURRENT_BUILD_TIME_AND_DATE();
 }
 
+String getUniqueSSID() {
+    uint8_t mac[6];
+    esp_wifi_get_mac(WIFI_IF_STA, mac);
+    
+    // Create a 5-character string from last 3 bytes of MAC
+    char uniqueId[6];
+    snprintf(uniqueId, sizeof(uniqueId), "%02X%03X", mac[4], mac[5]);
+    
+    return String("AquaCross-") + String(uniqueId);
+}
 
 
 // WiFi als Access Point