diff --git a/lib/controller.js b/lib/controller.js
index ea4ece494..c1e676a04 100644
--- a/lib/controller.js
+++ b/lib/controller.js
@@ -85,6 +85,13 @@ class Controller {
                 }
             });
         }
+
+        // Resend all cached states.
+        this.zigbee.getAllClients().forEach((device) => {
+            if (this.stateCache.hasOwnProperty(device.ieeeAddr)) {
+                this.mqttPublishDeviceState(device.ieeeAddr, this.stateCache[device.ieeeAddr], false);
+            }
+        });
     }
 
     softResetTimeout(start) {