diff --git a/manager/src/serverLifecycle.ts b/manager/src/serverLifecycle.ts
index f41d5aa..b29d5ce 100644
--- a/manager/src/serverLifecycle.ts
+++ b/manager/src/serverLifecycle.ts
@@ -613,11 +613,6 @@ export class ServerLifecycle {
 
 
 
-            logger.info(
-                "Stoppe leeren Server:",
-                server.name
-            );
-
             this.serverManager.stopServer(
 
                 server.id
diff --git a/manager/src/serverRegistry.ts b/manager/src/serverRegistry.ts
index 2660c97..7420b19 100644
--- a/manager/src/serverRegistry.ts
+++ b/manager/src/serverRegistry.ts
@@ -410,7 +410,7 @@ export class ServerRegistry {
 
 
 
-        if(srv.alive){
+        if(srv.alive && server.status !== "STOPPING"){
 
             if(!server.startedAt){