diff --git a/lib/solaar/listener.py b/lib/solaar/listener.py
index bc127868..82123982 100644
--- a/lib/solaar/listener.py
+++ b/lib/solaar/listener.py
@@ -222,13 +222,14 @@ def stop_all():
 		_log.info("stopping %s", listeners)
 
 		for l in listeners:
-			if l:
-				l.stop()
-		for l in listeners:
-			l.join()
+			l.stop()
 
 	configuration.save()
 
+	if listeners:
+		for l in listeners:
+			l.join()
+
 
 _status_callback = None
 _error_callback = None