diff --git a/home.admin/_background.sh b/home.admin/_background.sh
index 3aaa83529..4a4e61f50 100755
--- a/home.admin/_background.sh
+++ b/home.admin/_background.sh
@@ -52,6 +52,9 @@ do
   # source info file fresh on every loop
   source ${infoFile} 2>/dev/null
 
+  # make sure SSH server is configured & running
+  sudo /home/admin/config.scripts/blitz.ssh.sh checkrepair >> $logFile
+
   ####################################################
   # SKIP BACKGROUND TASK LOOP ON CERTAIN SYSTEM STATES
   # https://github.com/rootzoll/raspiblitz/issues/160
diff --git a/home.admin/_bootstrap.sh b/home.admin/_bootstrap.sh
index 567fc0d95..d820da1e0 100755
--- a/home.admin/_bootstrap.sh
+++ b/home.admin/_bootstrap.sh
@@ -251,9 +251,6 @@ else
 fi
 echo ""
 
-# make sure SSH server is configured & running (before first wait loop)
-sudo /home/admin/config.scripts/blitz.ssh.sh checkrepair >> $logFile
-
 ###############################
 # WAIT FOR ALL SERVICES