diff --git a/backend/src/media_library_viewer_api/main.py b/backend/src/media_library_viewer_api/main.py
index b9d63d3..b7eee03 100644
--- a/backend/src/media_library_viewer_api/main.py
+++ b/backend/src/media_library_viewer_api/main.py
@@ -16,8 +16,7 @@ from media_library_viewer_api.logging_utils import configure_logging, describe_s
 from media_library_viewer_api.routers import dashboard, monitoring, media, files, jobs, users, tasks
 from .version import get_backend_version, get_version_info
 from media_library_viewer_api.routers.settings import router as settings_router
-from media_library_viewer_api.dependencies import get_mail_queue, get_monitoring_poller, get_settings_store
-from media_library_viewer_api.services.known_hosts import ensure_known_hosts_for_machines
+from media_library_viewer_api.dependencies import get_mail_queue, get_monitoring_poller
 
 logger = logging.getLogger(__name__)
 
@@ -29,12 +28,7 @@ async def lifespan(app: FastAPI):
     configure_logging(settings.log_level)
     validate_auth_settings(settings)
     logger.info("Backend startup complete: %s", describe_settings(settings))
-    store = get_settings_store()
-    try:
-        changed = ensure_known_hosts_for_machines(store.list_machines(), settings.ssh_known_hosts_file)
-        logger.info("Managed known_hosts updated entries=%s file=%s", changed, settings.ssh_known_hosts_file)
-    except Exception:
-        logger.exception("Failed to synthesize managed known_hosts file")
+    logger.info("Managed known_hosts will be populated lazily on first successful SSH connection")
     mail_queue = get_mail_queue()
     monitoring_poller = get_monitoring_poller()
     mail_queue.start()