diff --git a/nfv/nfv-vim/nfv_vim/strategy/_strategy.py b/nfv/nfv-vim/nfv_vim/strategy/_strategy.py
index f0c9f34e..a70d20cd 100755
--- a/nfv/nfv-vim/nfv_vim/strategy/_strategy.py
+++ b/nfv/nfv-vim/nfv_vim/strategy/_strategy.py
@@ -2071,7 +2071,10 @@ class SwUpgradeStrategy(
             elif self._nfvi_alarms:
                 reason = "Active alarms found, can't apply software deployment"
 
-            elif self.nfvi_upgrade.is_deployed or self.nfvi_upgrade.is_available:
+            elif not self.nfvi_upgrade.deploy_info and (
+                    self.nfvi_upgrade.is_deployed or
+                    self.nfvi_upgrade.is_available
+            ):
                 from nfv_vim import tables
                 bad_hosts = []
                 host_table = tables.tables_get_host_table()
diff --git a/nfv/nfv-vim/nfv_vim/strategy/_strategy_steps.py b/nfv/nfv-vim/nfv_vim/strategy/_strategy_steps.py
index a87a69cd..26c48333 100755
--- a/nfv/nfv-vim/nfv_vim/strategy/_strategy_steps.py
+++ b/nfv/nfv-vim/nfv_vim/strategy/_strategy_steps.py
@@ -967,7 +967,7 @@ class SwDeployPrecheckStep(strategy.StrategyStep):
         from nfv_vim import nfvi
 
         DLOG.info("Step (%s) apply." % self._name)
-        if self.strategy.nfvi_upgrade.is_deploying or self.strategy.nfvi_upgrade.is_removing:
+        if self.strategy.nfvi_upgrade.deploy_info:
             reason = "Deployment already in progress, skipping precheck"
             DLOG.info(reason)
             return strategy.STRATEGY_STEP_RESULT.SUCCESS, reason