diff --git a/app/Listeners/RunForSavedForm.php b/app/Listeners/RunForSavedForm.php
new file mode 100755
index 000000000..a2b980b8f
--- /dev/null
+++ b/app/Listeners/RunForSavedForm.php
@@ -0,0 +1,21 @@
+<?php namespace App\Listeners;
+
+use Anomaly\SettingsModule\Setting\Form\SettingFormRepository;
+use Anomaly\Streams\Platform\Ui\Form\Event\FormWasSaved;
+
+class RunForSavedForm
+{
+
+    public function handle(FormWasSaved $event)
+    {
+        $builder = $event->getBuilder();
+
+        if (get_class($builder->getRepository()) === SettingFormRepository::class) {
+            if ($builder->getFormValues()->has('maintenance') and $builder->getFormValues()->get('maintenance')) {
+                file_put_contents(storage_path('framework/down'),
+                    json_encode(['time' => '', 'retry' => null, 'message' => null],
+                        JSON_PRETTY_PRINT));
+            }
+        }
+    }
+}
diff --git a/config/streams.php b/config/streams.php
index bc4d41f38..7f273cb0a 100644
--- a/config/streams.php
+++ b/config/streams.php
@@ -17,6 +17,9 @@ return [
         \Anomaly\Streams\Platform\Event\Booted::class => [
             \App\Listeners\Translations::class
         ],
+        \Anomaly\Streams\Platform\Ui\Form\Event\FormWasSaved::class => [
+            \App\Listeners\RunForSavedForm::class
+        ],
     ],
 
     /*