diff --git a/bundles/org.openhab.binding.monopriceaudio/src/main/java/org/openhab/binding/monopriceaudio/internal/handler/MonopriceAudioHandler.java b/bundles/org.openhab.binding.monopriceaudio/src/main/java/org/openhab/binding/monopriceaudio/internal/handler/MonopriceAudioHandler.java
index deaf3ffad9..9b72f673a1 100644
--- a/bundles/org.openhab.binding.monopriceaudio/src/main/java/org/openhab/binding/monopriceaudio/internal/handler/MonopriceAudioHandler.java
+++ b/bundles/org.openhab.binding.monopriceaudio/src/main/java/org/openhab/binding/monopriceaudio/internal/handler/MonopriceAudioHandler.java
@@ -462,9 +462,9 @@ public class MonopriceAudioHandler extends BaseThingHandler implements Monoprice
     private synchronized void closeConnection() {
         if (connector.isConnected()) {
             connector.close();
-            connector.removeEventListener(this);
             logger.debug("closeConnection(): disconnected");
         }
+        connector.removeEventListener(this);
     }
 
     @Override
@@ -698,10 +698,10 @@ public class MonopriceAudioHandler extends BaseThingHandler implements Monoprice
      * @param channelType the channel type to be updated
      */
     private void updateChannelState(String zoneId, String channelType) {
-        MonopriceAudioZoneDTO zoneData = zoneDataMap.get(zoneId);
+        final MonopriceAudioZoneDTO zoneData = zoneDataMap.get(zoneId);
 
         if (zoneData != null) {
-            String channel = amp.getZoneName(zoneId) + CHANNEL_DELIMIT + channelType;
+            final String channel = amp.getZoneName(zoneId) + CHANNEL_DELIMIT + channelType;
 
             if (!isLinked(channel)) {
                 return;
diff --git a/bundles/org.openhab.binding.nuvo/src/main/java/org/openhab/binding/nuvo/internal/handler/NuvoHandler.java b/bundles/org.openhab.binding.nuvo/src/main/java/org/openhab/binding/nuvo/internal/handler/NuvoHandler.java
index 6f23c63b4e..ca71ddb251 100644
--- a/bundles/org.openhab.binding.nuvo/src/main/java/org/openhab/binding/nuvo/internal/handler/NuvoHandler.java
+++ b/bundles/org.openhab.binding.nuvo/src/main/java/org/openhab/binding/nuvo/internal/handler/NuvoHandler.java
@@ -680,10 +680,10 @@ public class NuvoHandler extends BaseThingHandler implements NuvoMessageEventLis
     private synchronized void closeConnection() {
         if (connector.isConnected()) {
             connector.close();
-            connector.removeEventListener(this);
             pollStatusNeeded = true;
             logger.debug("closeConnection(): disconnected");
         }
+        connector.removeEventListener(this);
     }
 
     /**
diff --git a/bundles/org.openhab.binding.oppo/src/main/java/org/openhab/binding/oppo/internal/handler/OppoHandler.java b/bundles/org.openhab.binding.oppo/src/main/java/org/openhab/binding/oppo/internal/handler/OppoHandler.java
index 711fa8bb65..f9938e88aa 100644
--- a/bundles/org.openhab.binding.oppo/src/main/java/org/openhab/binding/oppo/internal/handler/OppoHandler.java
+++ b/bundles/org.openhab.binding.oppo/src/main/java/org/openhab/binding/oppo/internal/handler/OppoHandler.java
@@ -379,9 +379,9 @@ public class OppoHandler extends BaseThingHandler implements OppoMessageEventLis
 
         if (connector.isConnected()) {
             connector.close();
-            connector.removeEventListener(this);
             logger.debug("closeConnection(): disconnected");
         }
+        connector.removeEventListener(this);
     }
 
     /**