diff --git a/karapace/karapace.py b/karapace/karapace.py
index d6dba27bd..4aa28e54f 100644
--- a/karapace/karapace.py
+++ b/karapace/karapace.py
@@ -39,6 +39,11 @@ def __init__(self, config: dict) -> None:
         self.app.on_startup.append(self.create_http_client)
         self.master_lock = asyncio.Lock()
         self.log.info("Karapace initialized")
+        self.app.on_shutdown.append(self.close_by_app)
+
+    async def close_by_app(self, app):
+        # pylint: disable=unused-argument
+        await self.close()
 
     def _create_producer(self) -> KafkaProducer:
         while True:
diff --git a/karapace/karapace_all.py b/karapace/karapace_all.py
index 737818183..e0ce5ce52 100644
--- a/karapace/karapace_all.py
+++ b/karapace/karapace_all.py
@@ -15,11 +15,6 @@ class KarapaceAll(KafkaRest, KarapaceSchemaRegistry):
     def __init__(self, config: dict) -> None:
         super().__init__(config=config)
         self.log = logging.getLogger("KarapaceAll")
-        self.app.on_shutdown.append(self.close_by_app)
-
-    async def close_by_app(self, app):
-        # pylint: disable=unused-argument
-        await self.close()
 
 
 def main() -> int: