diff --git a/FHEM/73_NUKIBridge.pm b/FHEM/73_NUKIBridge.pm
index 503734e..4773bae 100644
--- a/FHEM/73_NUKIBridge.pm
+++ b/FHEM/73_NUKIBridge.pm
@@ -267,7 +267,7 @@ sub Initialize {
   ],
   "release_status": "stable",
   "license": "GPL_2",
-  "version": "v2.1.0",
+  "version": "v2.1.1",
   "x_apiversion": "1.13.0",
   "author": [
     "Marko Oldenburg <leongaultier@gmail.com>"
diff --git a/controls_NukiSmart.txt b/controls_NukiSmart.txt
index 27d1571..0056936 100644
--- a/controls_NukiSmart.txt
+++ b/controls_NukiSmart.txt
@@ -1,4 +1,4 @@
-UPD 2025-10-14_11:00:54 10358 FHEM/73_NUKIBridge.pm
-UPD 2025-10-15_06:53:37 11100 FHEM/74_NUKIDevice.pm
-UPD 2025-10-14_11:00:54 42820 lib/FHEM/Devices/Nuki/Bridge.pm
-UPD 2025-10-15_06:43:51 16775 lib/FHEM/Devices/Nuki/Device.pm
+UPD 2025-10-16_18:36:43 10358 FHEM/73_NUKIBridge.pm
+UPD 2025-10-15_06:55:14 11100 FHEM/74_NUKIDevice.pm
+UPD 2025-10-16_18:34:25 42928 lib/FHEM/Devices/Nuki/Bridge.pm
+UPD 2025-10-15_06:55:14 16775 lib/FHEM/Devices/Nuki/Device.pm
diff --git a/lib/FHEM/Devices/Nuki/Bridge.pm b/lib/FHEM/Devices/Nuki/Bridge.pm
index 03ba361..c5e7366 100644
--- a/lib/FHEM/Devices/Nuki/Bridge.pm
+++ b/lib/FHEM/Devices/Nuki/Bridge.pm
@@ -454,21 +454,24 @@ sub Set {
             return 'usage: callbackRemove'
               if ( split( m{\s+}xms, $arg ) > 1 );
             my $id = defined $arg ? $arg : 0;
-            $endpoint = 'callback/remove';
             $param    = '{"param":"' . $id . '"}';
+            $endpoint = 'callback/remove';
         },
         configauth => sub {
             return 'usage: configAuth'
               if ( split( m{\s+}xms, $arg ) > 1 );
             my $configAuth = 'enable=' . ( $arg eq 'enable' ? 1 : 0 );
-            $endpoint = 'configAuth';
             $param    = '{"param":"' . $configAuth . '"}';
+            $endpoint = 'configAuth';
         },
     );
 
     if ( exists $handlers{$cmd} ) {
         my $result = $handlers{$cmd}->();
-        return $result if defined $result && length $result;
+        return $result
+          if defined $result
+          && length $result
+          && $result ne $endpoint;
     }
     else {
         my $list = 'info:noArg getDeviceList:noArg ';
@@ -507,7 +510,10 @@ sub Get {
 
     if ( exists $handlers{$cmd} ) {
         my $result = $handlers{$cmd}->();
-        return $result if defined $result && length $result;
+        return $result
+          if defined $result
+          && length $result
+          && $result ne $endpoint;
     }
     else {
         my $list = 'callbackList:noArg ';