diff --git a/fhem/FHEM/TcpServerUtils.pm b/fhem/FHEM/TcpServerUtils.pm
index 4f72d5a34..a6fd3aba2 100644
--- a/fhem/FHEM/TcpServerUtils.pm
+++ b/fhem/FHEM/TcpServerUtils.pm
@@ -214,19 +214,21 @@ TcpServer_Close($@)
     delete($selectlist{$name});
     delete($hash->{FD});  # Avoid Read->Close->Write
     %ntfyHash = ();
-    if($dodel) {
-      delete $attr{$name};
-      delete $defs{$name};
-    } else {
-      $hash->{stacktrace} = stacktraceAsString(1);
-    }
   }
+
   if(defined($hash->{SERVERSOCKET})) {          # Server
     close($hash->{SERVERSOCKET});
     $name = $name . "." . $hash->{PORT};
     delete($selectlist{$name});
     delete($hash->{FD});  # Avoid Read->Close->Write
   }
+
+  if($dodel) {
+    delete $attr{$name};
+    delete $defs{$name};
+  } else {
+    $hash->{stacktrace} = stacktraceAsString(1);
+  }
   return undef;
 }