diff --git a/bundles/org.openhab.binding.unifi/src/main/java/org/openhab/binding/unifi/internal/handler/UniFiBaseThingHandler.java b/bundles/org.openhab.binding.unifi/src/main/java/org/openhab/binding/unifi/internal/handler/UniFiBaseThingHandler.java
index cf57ec332..69b6f8404 100644
--- a/bundles/org.openhab.binding.unifi/src/main/java/org/openhab/binding/unifi/internal/handler/UniFiBaseThingHandler.java
+++ b/bundles/org.openhab.binding.unifi/src/main/java/org/openhab/binding/unifi/internal/handler/UniFiBaseThingHandler.java
@@ -59,6 +59,7 @@ public abstract class UniFiBaseThingHandler<E, C> extends BaseThingHandler {
         }
         if (bridge.getStatus() == OFFLINE) {
             updateStatus(OFFLINE, ThingStatusDetail.BRIDGE_OFFLINE, "The UniFi Controller is currently offline.");
+            return;
         }
         // mgb: derive the config class from the generic type
         Class<?> clazz = (Class<?>) (((ParameterizedType) getClass().getGenericSuperclass())
diff --git a/bundles/org.openhab.binding.unifi/src/main/java/org/openhab/binding/unifi/internal/handler/UniFiClientThingHandler.java b/bundles/org.openhab.binding.unifi/src/main/java/org/openhab/binding/unifi/internal/handler/UniFiClientThingHandler.java
index 139e031fb..9ceaf35ba 100644
--- a/bundles/org.openhab.binding.unifi/src/main/java/org/openhab/binding/unifi/internal/handler/UniFiClientThingHandler.java
+++ b/bundles/org.openhab.binding.unifi/src/main/java/org/openhab/binding/unifi/internal/handler/UniFiClientThingHandler.java
@@ -69,16 +69,14 @@ public class UniFiClientThingHandler extends UniFiBaseThingHandler<UniFiClient,
     @Override
     protected synchronized void initialize(UniFiClientThingConfig config) {
         // mgb: called when the config changes
-        if (thing.getStatus() == INITIALIZING) {
-            logger.debug("Initializing the UniFi Client Handler with config = {}", config);
-            if (!config.isValid()) {
-                updateStatus(OFFLINE, CONFIGURATION_ERROR,
-                        "You must define a MAC address, IP address, hostname or alias for this thing.");
-                return;
-            }
-            this.config = config;
-            updateStatus(ONLINE);
+        logger.debug("Initializing the UniFi Client Handler with config = {}", config);
+        if (!config.isValid()) {
+            updateStatus(OFFLINE, CONFIGURATION_ERROR,
+                    "You must define a MAC address, IP address, hostname or alias for this thing.");
+            return;
         }
+        this.config = config;
+        updateStatus(ONLINE);
     }
 
     private static boolean belongsToSite(UniFiClient client, String siteName) {