diff --git a/src/xpra/log.py b/src/xpra/log.py
index 60c830c375..be4bf41ea4 100644
--- a/src/xpra/log.py
+++ b/src/xpra/log.py
@@ -141,6 +141,7 @@ def standard_logging(log, level, msg, *args, **kwargs):
 global_logging_handler = standard_logging
 
 def set_global_logging_handler(h):
+    assert callable(h)
     global global_logging_handler
     saved = global_logging_handler
     global_logging_handler = h
diff --git a/src/xpra/server/mixins/logging_server.py b/src/xpra/server/mixins/logging_server.py
index a30356b503..a81105b3ac 100644
--- a/src/xpra/server/mixins/logging_server.py
+++ b/src/xpra/server/mixins/logging_server.py
@@ -85,7 +85,7 @@ def stop_capturing_logging(self):
         ll = self.local_logging
         if ll:
             self.local_logging = None
-            set_global_logging_handler(self.local_logging)
+            set_global_logging_handler(ll)
 
 
     def remote_logging_handler(self, log, level, msg, *args, **kwargs):