diff --git a/src/server/main.c b/src/server/main.c
index 875f9c3..caa9d65 100644
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -83,6 +83,9 @@
     return match;
 }
 
+// For Fiber we do not let DIAL handle SIGTERM, as we consider that a killing
+// signal (pkillwait uses it first).
+/*
 void signalHandler(int signal)
 {
     switch(signal)
@@ -92,6 +95,7 @@
             break;
     }
 }
+*/
 
 /* The URL encoding source code was obtained here:
  * http://www.geekhideout.com/urlcode.shtml
@@ -488,11 +492,14 @@
 
 int main(int argc, char* argv[])
 {
+    // We want DIAL to die on a SIGTERM - pkillwait sends SIGTERM first.
+    /*
     struct sigaction action;
     action.sa_handler = signalHandler;
     sigemptyset(&action.sa_mask);
     action.sa_flags = 0;
     sigaction(SIGTERM, &action, NULL);
+    */
 
     srand(time(NULL));
     int i;