diff --git a/src/st-util/gdb-server.c b/src/st-util/gdb-server.c
index a2f73582..c2541d4a 100644
--- a/src/st-util/gdb-server.c
+++ b/src/st-util/gdb-server.c
@@ -92,8 +92,13 @@ static void _cleanup() {
 static void cleanup(int32_t signum) {
     printf("Receive signal %i. Exiting...\n", signum);
     _cleanup();
-    exit(1);
-    (void)signum;
+    // if asked to gracefully terminate
+    if(signum == SIGTERM){
+        // return 0
+        exit(0);
+    }else{
+        exit(1);
+    }
 }
 
 #if defined(_WIN32)