diff --git a/src/main.py b/src/main.py
index 626a475..138b857 100644
--- a/src/main.py
+++ b/src/main.py
@@ -347,6 +347,15 @@ app.include_router(network_analysis_router)
 app.include_router(tutorial_router)
 app.include_router(geoint_router, prefix="/api/geoint")
 
+@app.on_event("startup")
+@app.on_event("startup")
+async def _start_aisstream_on_startup():
+    import asyncio
+    from routers.geoint import _start_aisstream
+    await asyncio.sleep(3)
+    _start_aisstream()
+
+
 
 @app.websocket("/api/ws")
 async def websocket_endpoint(websocket: WebSocket):
diff --git a/src/routers/geoint.py b/src/routers/geoint.py
index 9c38b71..f1e36ea 100644
--- a/src/routers/geoint.py
+++ b/src/routers/geoint.py
@@ -298,10 +298,3 @@ async def get_gdelt(
     _set_cache(cache_key, data)
     return data
 
-
-# Auto-Start: AISStream bei erstem Request starten
-@router.on_event("startup")
-async def _auto_start_aisstream():
-    import asyncio
-    await asyncio.sleep(2)
-    _start_aisstream()