diff --git a/pkg/client/deconzclient.go b/pkg/client/deconzclient.go
index 226087c..131246c 100644
--- a/pkg/client/deconzclient.go
+++ b/pkg/client/deconzclient.go
@@ -541,8 +541,6 @@ func (c *DeconzClient) deconzClientLoop() {
 
 	if c.deconz == nil {
 		c.setupDeconz()
-	} else {
-		return
 	}
 
 	if c.deconz != nil {
diff --git a/pkg/deconz/websocket.go b/pkg/deconz/websocket.go
index a90da3d..b973f0e 100644
--- a/pkg/deconz/websocket.go
+++ b/pkg/deconz/websocket.go
@@ -27,7 +27,9 @@ const (
 // Stop the listen Loop
 func (d *Deconz) Stop() {
 
-	d.controlChannel <- "stop"
+	if d.controlChannel != nil {
+		d.controlChannel <- "stop"
+	}
 
 }