diff --git a/startdb.py b/startdb.py
index 08098d6..32b8c90 100644
--- a/startdb.py
+++ b/startdb.py
@@ -239,7 +239,6 @@ async def load_database_from_mqtt(
 # -------------------------
 async def main():
     check_optional_deps()
-    await mqtt_store.load_gateway_cache()
     logger = logging.getLogger(__name__)
 
     # Initialize database
@@ -268,6 +267,9 @@ async def main():
         await mqtt_database.create_tables()
         logger.info("Database tables created")
 
+        # Load MQTT gateway cache after DB init/migrations
+        await mqtt_store.load_gateway_cache()
+
     finally:
         # Clear migration in progress flag
         logger.info("Clearing migration status...")