diff --git a/home.admin/50cloneHDD.sh b/home.admin/50cloneHDD.sh
index 591b77d1e..2336b44f8 100644
--- a/home.admin/50cloneHDD.sh
+++ b/home.admin/50cloneHDD.sh
@@ -204,5 +204,7 @@ else
 
 fi
 
-# setup script will decide the next logical step
-./10setupBlitz.sh
\ No newline at end of file
+if [ ${setupStep} -lt 100 ]; then
+  # setup script will decide the next logical step
+  /home/admin/10setupBlitz.sh
+fi
\ No newline at end of file
diff --git a/home.admin/50copyHDD.sh b/home.admin/50copyHDD.sh
index d3d7ba284..262b03e93 100755
--- a/home.admin/50copyHDD.sh
+++ b/home.admin/50copyHDD.sh
@@ -115,5 +115,7 @@ else
 
 fi
 
-# setup script will decide the next logical step
-/home/admin/10setupBlitz.sh
\ No newline at end of file
+if [ ${setupStep} -lt 100 ]; then
+  # setup script will decide the next logical step
+  /home/admin/10setupBlitz.sh
+fi
\ No newline at end of file
diff --git a/home.admin/50downloadHDD.sh b/home.admin/50downloadHDD.sh
index 0fbb9fdb8..ce0cc5bd8 100755
--- a/home.admin/50downloadHDD.sh
+++ b/home.admin/50downloadHDD.sh
@@ -153,10 +153,11 @@ else
   sudo mv ${targetDir}${targetPath} /mnt/hdd/${network}
   echo "OK"
 
-  # set SetupState
-  sudo sed -i "s/^setupStep=.*/setupStep=50/g" /home/admin/raspiblitz.info
-
-  # continue setup
-  ./60finishHDD.sh
+  if [ ${setupStep} -lt 100 ]; then
+    # set SetupState
+    sudo sed -i "s/^setupStep=.*/setupStep=50/g" /home/admin/raspiblitz.info
+    # continue setup
+    ./60finishHDD.sh
+  fi
 
 fi
\ No newline at end of file
diff --git a/home.admin/50torrentHDD.sh b/home.admin/50torrentHDD.sh
index 57a2cc26b..d95dbf4f8 100755
--- a/home.admin/50torrentHDD.sh
+++ b/home.admin/50torrentHDD.sh
@@ -268,8 +268,9 @@ sudo rm -r ${targetDir}
 echo "OK"
 date +%s
 
-# set SetupState
-sudo sed -i "s/^setupStep=.*/setupStep=50/g" /home/admin/raspiblitz.info
-
-# continue setup
-./60finishHDD.sh
\ No newline at end of file
+if [ ${setupStep} -lt 100 ]; then
+  # set SetupState
+  sudo sed -i "s/^setupStep=.*/setupStep=50/g" /home/admin/raspiblitz.info
+  # continue setup
+  ./60finishHDD.sh
+fi
\ No newline at end of file