diff --git a/code/espurna/config/hardware.h b/code/espurna/config/hardware.h
index a2ddf302..add83ec0 100644
--- a/code/espurna/config/hardware.h
+++ b/code/espurna/config/hardware.h
@@ -250,8 +250,6 @@
 
     #define MANUFACTURER        "AI THINKER"
     #define DEVICE              "AI LIGHT"
-    #define RELAY1_PIN          2
-    #define RELAY1_PIN_INVERSE  0
     #undef RELAY_PROVIDER
     #define RELAY_PROVIDER      RELAY_PROVIDER_MY9291
 
diff --git a/code/espurna/relay.ino b/code/espurna/relay.ino
index fca6e3f3..6631871a 100644
--- a/code/espurna/relay.ino
+++ b/code/espurna/relay.ino
@@ -478,13 +478,19 @@ void relayMQTTCallback(unsigned int type, const char * topic, const char * paylo
         #if RELAY_PROVIDER == RELAY_PROVIDER_MY9291
             if (strncmp(t, MQTT_COLOR_TOPIC, strlen(MQTT_COLOR_TOPIC)) == 0) {
 
+                unsigned char red, green, blue = 0;
+
                 char * p;
                 p = strtok((char *) payload, ",");
-                unsigned char red = atoi(p);
-                p = strtok(NULL, ",");
-                unsigned char green = atoi(p);
+                red = atoi(p);
                 p = strtok(NULL, ",");
-                unsigned char blue = atoi(p);
+                if (p != NULL) {
+                    green = atoi(p);
+                    p = strtok(NULL, ",");
+                    if (p != NULL) blue = atoi(p);
+                } else {
+                    green = blue = red;
+                }
                 if ((red == green) && (green == blue)) {
                     setLightColor(0, 0, 0, red);
                 } else {
@@ -543,6 +549,11 @@ void relaySetup() {
         _relays.push_back((relay_t) {0, 0});
         _relays.push_back((relay_t) {0, 0});
 
+    #elif AI_LIGHT
+
+        // One dummy relay for the AI Thinker Light
+        _relays.push_back((relay_t) {0, 0});
+
     #else
 
         #ifdef RELAY1_PIN