diff --git a/setup/src/Magento/Setup/Model/Cron/JobSetCache.php b/setup/src/Magento/Setup/Model/Cron/JobSetCache.php
index 186634556fa01e999390255f00312aebb3958743..0ae05e140f4300f9bbd994dbb194c54d6ec84b8e 100644
--- a/setup/src/Magento/Setup/Model/Cron/JobSetCache.php
+++ b/setup/src/Magento/Setup/Model/Cron/JobSetCache.php
@@ -54,7 +54,8 @@ class JobSetCache extends AbstractJob
     public function execute()
     {
         try {
-            $this->command->run(new ArrayInput(['command' => $this->command->getName()]), $this->output);
+            $this->params['command'] = $this->command->getName();
+            $this->command->run(new ArrayInput($this->params), $this->output);
         } catch (\Exception $e) {
             $this->status->toggleUpdateError(true);
             throw new \RuntimeException(sprintf('Could not complete %s successfully: %s', $this, $e->getMessage()));
diff --git a/setup/src/Magento/Setup/Model/UpdaterTaskCreator.php b/setup/src/Magento/Setup/Model/UpdaterTaskCreator.php
index 0b673ef33273da19ba6c54580f275cd1a8506681..2acebd3016d81e361ebef7488d60e59c9db9887e 100644
--- a/setup/src/Magento/Setup/Model/UpdaterTaskCreator.php
+++ b/setup/src/Magento/Setup/Model/UpdaterTaskCreator.php
@@ -138,12 +138,6 @@ class UpdaterTaskCreator
                 \Magento\Setup\Model\Cron\JobFactory::JOB_UPGRADE,
                 []
             );
-        } elseif ($jobType == 'disable') {
-            $errorMessage .= $this->updater->createUpdaterTask(
-                [],
-                \Magento\Setup\Model\Updater::TASK_TYPE_MAINTENANCE_MODE,
-                ['enable' => false]
-            );
         }
 
         $enabledCaches = [];
@@ -161,6 +155,14 @@ class UpdaterTaskCreator
             );
         }
 
+        if ($jobType == 'disable') {
+            $errorMessage .= $this->updater->createUpdaterTask(
+                [],
+                \Magento\Setup\Model\Updater::TASK_TYPE_MAINTENANCE_MODE,
+                ['enable' => false]
+            );
+        }
+
         return $errorMessage;
     }