diff --git a/src/main.py b/src/main.py
index 5b1b615..7717625 100644
--- a/src/main.py
+++ b/src/main.py
@@ -18,6 +18,7 @@ from src.auth.config import auth_settings
 from src.misp.service import MISPHandler
 
 # TODO: Create Pydantic request/response schemas
+# TODO: Untie MISP connection from app loading
 
 
 @asynccontextmanager
@@ -25,7 +26,8 @@ async def lifespan(_application: FastAPI) -> AsyncGenerator:
 	# Startup
 	yield
 	# Shutdown
-	_application.misp_handler.stop_timer()
+	if hasattr(_application, "misp_handler"):
+		_application.misp_handler.stop_timer()
 
 
 if settings.ENVIRONMENT.is_deployed: