diff --git a/server.go b/server.go
index b0ca83e..651a252 100644
--- a/server.go
+++ b/server.go
@@ -102,7 +102,7 @@ func (srv *RttyServer) DelDevice(dev *Device) {
 		return
 	}
 
-	if _, loaded := g.devices.LoadAndDelete(dev.id); loaded {
+	if deleted := g.devices.CompareAndDelete(dev.id, dev); deleted {
 		if g.count.Add(-1) == 0 {
 			srv.groups.Delete(dev.group)
 		}