diff --git a/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathome/internal/handler/FreeAtHomeBridgeHandler.java b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathome/internal/handler/FreeAtHomeBridgeHandler.java
index cf719f0e71091..e7f82d06e04f8 100644
--- a/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathome/internal/handler/FreeAtHomeBridgeHandler.java
+++ b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathome/internal/handler/FreeAtHomeBridgeHandler.java
@@ -429,9 +429,10 @@ public void setDatapointOnWebsocketFeedback(String receivedText) {
 
                 if (deviceHandler != null) {
                     deviceHandler.onDeviceStateChanged(eventDatapointID, value);
+                    logger.debug("Socket event processed: event-datapoint-ID {} value {}", eventDatapointID, value);
+                } else {
+                    logger.debug("Socket event not processed: event-datapoint-ID {} value {}", eventDatapointID, value);
                 }
-
-                logger.debug("Socket event processed: event-datapoint-ID {} value {}", eventDatapointID, value);
             }
         }
     }
diff --git a/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathome/internal/handler/FreeAtHomeDeviceHandler.java b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathome/internal/handler/FreeAtHomeDeviceHandler.java
index 5343613c3e911..66a2a69c878e3 100644
--- a/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathome/internal/handler/FreeAtHomeDeviceHandler.java
+++ b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathome/internal/handler/FreeAtHomeDeviceHandler.java
@@ -291,20 +291,6 @@ public void handleCommand(ChannelUID channelUID, Command command) {
         if (dpg == null) {
             logger.debug("Handle command for device (but invalid datapointgroup) {} - at channel {} - full command {}",
                     device.getDeviceId(), channelUID.getAsString(), command.toFullString());
-
-            logger.debug("Try to find channelUID in dpg: {}", channelUID.getAsString());
-            logger.debug("dpg: ");
-            mapChannelUID.forEach((k, v) -> {
-                if (v.getOutputDatapoint() != null) {
-                    logger.debug("key: {} - input value: {}", k, v.getOutputDatapoint().getChannelIdforDatapoint() + " "
-                            + v.getOutputDatapoint().getDatapointId());
-                }
-                if (v.getInputDatapoint() != null) {
-                    logger.debug("key: {} - output value: {}", k, v.getInputDatapoint().getChannelIdforDatapoint() + " "
-                            + v.getInputDatapoint().getDatapointId());
-                }
-            });
-
             updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR,
                     "@text/conf-error.invalid-deviceconfig");
         } else {
@@ -602,7 +588,7 @@ private void reloadChannelTypes() throws FreeAtHomeGeneralException {
     }
 
     // Create a channel UID. Makes sure that the channel UID is unique and generated the same way every time
-    private ChannelUID createChannelUID(ThingUID thingUID,String channelID, String dpgLabel) {
+    private ChannelUID createChannelUID(ThingUID thingUID, String channelID, String dpgLabel) {
         ChannelUID channelUID = new ChannelUID(thingUID, channelID, dpgLabel.substring(4));
         return channelUID;
     }