diff --git a/src/necronda-server.c b/src/necronda-server.c
index 4d5b4de..5f2de76 100644
--- a/src/necronda-server.c
+++ b/src/necronda-server.c
@@ -138,8 +138,12 @@ void terminate() {
     signal(SIGINT, SIG_IGN);
     signal(SIGTERM, SIG_IGN);
 
-    sleep(1);
-    fprintf(stderr, "\nGoodbye\n");
+    if (wait_num > 0) {
+        sleep(1);
+        fprintf(stderr, "\nGoodbye\n");
+    } else {
+        fprintf(stderr, "Goodbye\n");
+    }
     exit(0);
 }