diff --git a/CHANGES.rst b/CHANGES.rst
index <HASH>..<HASH> 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -25,6 +25,8 @@ Removed
 
 Fixed
 -----
+- :kbd:`^c` not able to terminate initialization process due to the handler
+  registered.
 
 Known issue
 -----------
diff --git a/ehforwarderbot/__main__.py b/ehforwarderbot/__main__.py
index <HASH>..<HASH> 100644
--- a/ehforwarderbot/__main__.py
+++ b/ehforwarderbot/__main__.py
@@ -332,11 +332,14 @@ def main():
     setup_logging(args, conf)
     setup_telemetry(conf['telemetry'])
 
+    init(conf)
+
+    # Only register graceful stop signals when we are ready to start
+    # polling threads.
     atexit.register(stop_gracefully)
     signal.signal(signal.SIGTERM, stop_gracefully)
     signal.signal(signal.SIGINT, stop_gracefully)
 
-    init(conf)
     poll()
 
 
diff --git a/ehforwarderbot/__version__.py b/ehforwarderbot/__version__.py
index <HASH>..<HASH> 100644
--- a/ehforwarderbot/__version__.py
+++ b/ehforwarderbot/__version__.py
@@ -1,3 +1,3 @@
 # coding=utf-8
 
-__version__ = "2.1.0"
+__version__ = "2.1.1.dev1"
fix: ^c not able to stop the init process (#<I>)