diff --git a/utils/cloud_dispatcher/dispatcherserver.cpp b/utils/cloud_dispatcher/dispatcherserver.cpp
index bd8d2c4e..a9ba2709 100644
--- a/utils/cloud_dispatcher/dispatcherserver.cpp
+++ b/utils/cloud_dispatcher/dispatcherserver.cpp
@@ -45,13 +45,13 @@ void DispatcherServer::picoutStatus() {
 
 void DispatcherServer::cleanClients() {
 	PIMutexLocker locker(map_mutex);
+	for (auto s: rmrf_servers)
+		s->close();
+	piDeleteAllAndClear(rmrf_servers);
 	for (auto c: rmrf_clients) {
 		if (!c->isPIObject()) piCout << "ACHTUNG! Non-piobject client!";
 	}
 	piDeleteAllAndClear(rmrf_clients);
-	for (auto s: rmrf_servers)
-		s->close();
-	piDeleteAllAndClear(rmrf_servers);
 	for (auto c: clients) {
 		if (!index_c_servers.contains(c) && !index_c_clients.contains(c)) {
 			if (!rm_clients.contains(c)) rm_clients << c;