diff --git a/app/Listeners/EnableMaintenanceMode.php b/app/Listeners/EnableMaintenanceMode.php
index 9aa9fb8ba..0baa89f1b 100755
--- a/app/Listeners/EnableMaintenanceMode.php
+++ b/app/Listeners/EnableMaintenanceMode.php
@@ -11,8 +11,12 @@ class EnableMaintenanceMode
     {
         $builder = $event->getBuilder();
         if (get_class($builder->getRepository()) === SettingFormRepository::class) {
-            if ($builder->getFormValues()->has('maintenance') and $builder->getFormValues()->get('maintenance')) {
-                Artisan::call('down');
+            if ($builder->getFormValues()->has('maintenance')) {
+                if ($builder->getFormValues()->get('maintenance')) {
+                    Artisan::call('down');
+                } elseif (config('streams::maintenance.enabled')) {
+                    Artisan::call('up');
+                }
             }
         }
     }