diff --git a/src/Settings.cpp b/src/Settings.cpp
index 6957922..70c29d9 100644
--- a/src/Settings.cpp
+++ b/src/Settings.cpp
@@ -249,6 +249,7 @@ void Settings::processConfig(const String &message)
             const bool working = doc[F("data")];
             Serial.printf_P(PSTR("working: %s\n"), working ? PSTR("true") : PSTR("false"));
             mySettings->generalSettings.working = working;
+            saveLater();
         } else if (event == F("ACTIVE_EFFECT")) {
 //            const int index = doc[F("data")];
 //            effectsManager->activateEffect(static_cast<uint8_t>(index));
@@ -488,6 +489,10 @@ bool Settings::readSettings()
         generalSettings.activeEffect = root[F("activeEffect")];
     }
 
+    if (root.containsKey(F("working"))) {
+        generalSettings.working = root[F("working")];
+    }
+
     copyFile(settingsFileNameSave, settingsFileName);
 
     return true;
diff --git a/src/main.cpp b/src/main.cpp
index bd7fe90..a9ca1b0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -244,7 +244,9 @@ void setup() {
     button->setTickMode(false);
     button->setStepTimeout(20);
 
-    myMatrix->matrixTest();
+    if (mySettings->generalSettings.working) {
+        myMatrix->matrixTest();
+    }
 
     button->tick();
     if (button->state()) {