diff --git a/opencloud/cmd/opencloud/main.go b/opencloud/cmd/opencloud/main.go
index 4b2d7a29f9..c80d4aca9c 100644
--- a/opencloud/cmd/opencloud/main.go
+++ b/opencloud/cmd/opencloud/main.go
@@ -16,9 +16,7 @@ func main() {
 	// INFO: this is a hotfix, we need to replace suture and wait for nats to
 	//       gracefully shutdown using rungroups
 	// 		 see https://github.com/opencloud-eu/opencloud/issues/2282
-	if os.Getenv("TEST_SERVER_URL") == "" {
-		fmt.Println("Waiting for 30 seconds before exiting...")
-		time.Sleep(30 * time.Second)
-		fmt.Println("Exiting...")
-	}
+	fmt.Println("Waiting for 30 seconds before exiting...")
+	time.Sleep(30 * time.Second)
+	fmt.Println("Exiting...")
 }