diff --git a/webserver.go b/webserver.go
index e2746d1..fb4aa2b 100644
--- a/webserver.go
+++ b/webserver.go
@@ -117,6 +117,9 @@ func actionDeviceUpdate(w http.ResponseWriter, r *http.Request) { // {{{
 	}
 	device.Password = "" // don't leak unnecessarily
 
+	// Remove current connection to router
+	delete(devices, device.ID)
+
 	j, _ := json.Marshal(struct {
 		OK     bool
 		Device Device