diff --git a/pylokid/__init__.py b/pylokid/__init__.py
index a5c817b..b68dbf1 100644
--- a/pylokid/__init__.py
+++ b/pylokid/__init__.py
@@ -2,6 +2,6 @@
 Pylokid. From Mail to Lodur - all automated.
 """
 
-__version__ = "3.0.3"
+__version__ = "3.0.2"
 __git_version__ = "0"
 __url__ = "https://github.com/tobru/pylokid"
diff --git a/pylokid/__main__.py b/pylokid/__main__.py
index f215c72..614cdc6 100644
--- a/pylokid/__main__.py
+++ b/pylokid/__main__.py
@@ -4,4 +4,7 @@ Helper module to run not-installed version (via ``python3 -m pylokid``)
 from pylokid.main import main
 
 if __name__ == "__main__":
-    main()
+    try:
+        main()
+    except KeyboardInterrupt:
+        print("Byebye")
diff --git a/pylokid/main.py b/pylokid/main.py
index f1bf62f..93ba628 100644
--- a/pylokid/main.py
+++ b/pylokid/main.py
@@ -5,7 +5,6 @@
 import logging
 import os
 import time
-import signal
 
 import requests
 from importlib.metadata import version
@@ -38,20 +37,6 @@ PUSHOVER_API_TOKEN = os.getenv("PUSHOVER_API_TOKEN")
 PUSHOVER_USER_KEY = os.getenv("PUSHOVER_USER_KEY")
 
 
-class GracefulKiller:
-    kill_now = False
-    signals = {signal.SIGINT: "SIGINT", signal.SIGTERM: "SIGTERM"}
-
-    def __init__(self, logger):
-        signal.signal(signal.SIGINT, self.exit_gracefully)
-        signal.signal(signal.SIGTERM, self.exit_gracefully)
-        self.logger = logger
-
-    def exit_gracefully(self, signum, frame):
-        self.logger.info("Received signal %s", self.signals[signum])
-        self.kill_now = True
-
-
 def main():
     """ main """
 
@@ -63,8 +48,6 @@ def main():
     logger = logging.getLogger("pylokid")
     logger.info("Starting pylokid version %s", version("pylokid"))
 
-    killer = GracefulKiller(logger)
-
     # Initialize IMAP Session
     imap_client = EmailHandling(
         IMAP_SERVER,
@@ -261,11 +244,6 @@ def main():
 
         # send heartbeat
         requests.get(HEARTBEAT_URL)
-
-        while not killer.kill_now:
-            # repeat every
-            logger.info("Waiting %s seconds until next check", IMAP_CHECK_INTERVAL)
-            time.sleep(int(IMAP_CHECK_INTERVAL))
-
-        logger.info("Pylokid waves bye bye")
-        exit()
+        # repeat every
+        logger.info("Waiting %s seconds until next check", IMAP_CHECK_INTERVAL)
+        time.sleep(int(IMAP_CHECK_INTERVAL))
diff --git a/pyproject.toml b/pyproject.toml
index a2f1ed8..7ca879b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pylokid"
-version = "3.0.3"
+version = "3.0.2"
 description = ""
 authors = ["Tobias Brunner <tobias@tobru.ch>"]
 license = "MIT"