diff --git a/src/calibre/srv/standalone.py b/src/calibre/srv/standalone.py
index 95b9ca82bd..fccf619407 100644
--- a/src/calibre/srv/standalone.py
+++ b/src/calibre/srv/standalone.py
@@ -129,4 +129,6 @@ def main(args=sys.argv):
         with lopen(opts.pidfile, 'wb') as f:
             f.write(str(os.getpid()))
     signal.signal(signal.SIGTERM, lambda s,f: server.stop())
+    if not opts.daemonize:
+        signal.signal(signal.SIGHUP, lambda s,f: server.stop())
     server.serve_forever()