diff --git a/README.md b/README.md
index 5cc83b57..4afac0a8 100644
--- a/README.md
+++ b/README.md
@@ -250,7 +250,7 @@ The following example demonstrates how to create a user and a group, assign perm
 
 ```groovy
 boolean canRun() {
-    return conditions.idleSelf() && conditions.everyHour()
+    return conditions.notQueuedSelf() && conditions.everyHour()
 }
 
 void doRun() {
diff --git a/core/src/main/java/dev/vml/es/acm/core/code/Conditions.java b/core/src/main/java/dev/vml/es/acm/core/code/Conditions.java
index 36f35068..45e18bb5 100644
--- a/core/src/main/java/dev/vml/es/acm/core/code/Conditions.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/Conditions.java
@@ -61,32 +61,40 @@ public Stream<Execution> passedExecutions() {
         return executionHistory.findAll(query);
     }
 
+    public boolean idle() {
+        return notQueued();
+    }
+
     public boolean idleSelf() {
-        if (executionContext.getExecutor().isLocking() && lockedSelf()) {
+        return notQueuedSelf();
+    }
+
+    public boolean notQueued() {
+        if (executionContext.getExecutor().isLocking() && lockedAny()) {
             return false;
         }
-        return !queuedSelfExecutions().findAny().isPresent();
+        return !queuedExecutions().findAny().isPresent();
     }
 
-    public boolean notRunningSelf() {
+    public boolean notQueuedSelf() {
         if (executionContext.getExecutor().isLocking() && lockedSelf()) {
             return false;
         }
-        return noneRunning(queuedSelfExecutions());
+        return !queuedSelfExecutions().findAny().isPresent();
     }
 
-    public boolean idle() {
+    public boolean notRunning() {
         if (executionContext.getExecutor().isLocking() && lockedAny()) {
             return false;
         }
-        return !queuedExecutions().findAny().isPresent();
+        return noneRunning(queuedExecutions());
     }
 
-    public boolean notRunning() {
+    public boolean notRunningSelf() {
         if (executionContext.getExecutor().isLocking() && lockedAny()) {
             return false;
         }
-        return noneRunning(queuedExecutions());
+        return noneRunning(queuedSelfExecutions());
     }
 
     private boolean noneRunning(Stream<Execution> queuedExecutions) {
@@ -627,7 +635,7 @@ public boolean retry(long count) {
         if (count < 1) {
             throw new IllegalArgumentException("Retry count must be greater than zero!");
         }
-        if (!idleSelf()) {
+        if (!notQueuedSelf()) {
             return false;
         }
         Execution passedExecution = passedExecution();
diff --git a/core/src/main/java/dev/vml/es/acm/core/code/ExecutionQueue.java b/core/src/main/java/dev/vml/es/acm/core/code/ExecutionQueue.java
index 4fa60fa0..e5418a70 100644
--- a/core/src/main/java/dev/vml/es/acm/core/code/ExecutionQueue.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/ExecutionQueue.java
@@ -67,7 +67,7 @@ protected void deactivate() {
         }
     }
 
-    public Optional<Execution> submit(ExecutionContextOptions contextOptions, Executable executable)
+    public Execution submit(ExecutionContextOptions contextOptions, Executable executable)
             throws AcmException {
         Map<String, Object> jobProps = new HashMap<>();
         jobProps.putAll(ExecutionContextOptions.toJobProps(contextOptions));
@@ -76,9 +76,9 @@ public Optional<Execution> submit(ExecutionContextOptions contextOptions, Execut
 
         Job job = jobManager.addJob(TOPIC, jobProps);
         if (job == null) {
-            return Optional.empty();
+            throw new AcmException(String.format("Execution of executable '%s' cannot be queued because manager refused to add a job!", executable.getId()));
         }
-        return Optional.of(new QueuedExecution(executor, job));
+        return new QueuedExecution(executor, job);
     }
 
     public Stream<Execution> findAll() {
diff --git a/core/src/main/java/dev/vml/es/acm/core/code/Executor.java b/core/src/main/java/dev/vml/es/acm/core/code/Executor.java
index d8359485..e4513ce9 100644
--- a/core/src/main/java/dev/vml/es/acm/core/code/Executor.java
+++ b/core/src/main/java/dev/vml/es/acm/core/code/Executor.java
@@ -82,7 +82,7 @@ public Execution execute(Executable executable, ExecutionContextOptions contextO
             return execute(executionContext);
         } catch (LoginException e) {
             throw new AcmException(
-                    String.format("Cannot access repository while executing '%s'", executable.getId()), e);
+                    String.format("Cannot access repository while executing '%s'!", executable.getId()), e);
         }
     }
 
diff --git a/core/src/main/java/dev/vml/es/acm/core/script/ScriptScheduler.java b/core/src/main/java/dev/vml/es/acm/core/script/ScriptScheduler.java
index bfffc447..43608f28 100644
--- a/core/src/main/java/dev/vml/es/acm/core/script/ScriptScheduler.java
+++ b/core/src/main/java/dev/vml/es/acm/core/script/ScriptScheduler.java
@@ -1,10 +1,7 @@
 package dev.vml.es.acm.core.script;
 
 import dev.vml.es.acm.core.AcmException;
-import dev.vml.es.acm.core.code.ExecutionContextOptions;
-import dev.vml.es.acm.core.code.ExecutionMode;
-import dev.vml.es.acm.core.code.ExecutionQueue;
-import dev.vml.es.acm.core.code.Executor;
+import dev.vml.es.acm.core.code.*;
 import dev.vml.es.acm.core.instance.HealthChecker;
 import dev.vml.es.acm.core.instance.HealthStatus;
 import dev.vml.es.acm.core.util.ResourceUtils;
@@ -114,12 +111,34 @@ public void run() {
             scriptRepository.clean();
 
             scriptRepository.findAll(ScriptType.ENABLED).forEach(script -> {
-                queue.submit(contextOptions, script);
+                if (checkScript(script, resourceResolver)) {
+                    submitScript(script, contextOptions);
+                }
             });
 
             runCount.incrementAndGet();
         } catch (Exception e) {
-            LOG.error("Failed to access repository while scheduling enabled scripts to execution queue", e);
+            LOG.error("Cannot access repository while scheduling enabled scripts to execution queue!", e);
+        }
+    }
+
+    private boolean checkScript(Script script, ResourceResolver resourceResolver) {
+        try (ExecutionContext context =
+                     executor.createContext(ExecutionId.generate(), ExecutionMode.CHECK, script, resourceResolver)) {
+            Execution execution = executor.execute(context);
+            LOG.debug("Script checked '{}'", execution);
+            return execution.getStatus() != ExecutionStatus.SKIPPED;
+        } catch (Exception e) {
+            LOG.error("Cannot check script '{}' while scheduling to execution queue!", script.getId(), e);
+            return false;
+        }
+    }
+
+    private void submitScript(Script script, ExecutionContextOptions contextOptions) {
+        try {
+            queue.submit(contextOptions, script);
+        } catch (Exception e) {
+            LOG.error("Cannot submit script '{}' to execution queue!", script.getId(), e);
         }
     }
 
diff --git a/core/src/main/java/dev/vml/es/acm/core/servlet/QueueCodeServlet.java b/core/src/main/java/dev/vml/es/acm/core/servlet/QueueCodeServlet.java
index 6225b3d9..bc9e3573 100644
--- a/core/src/main/java/dev/vml/es/acm/core/servlet/QueueCodeServlet.java
+++ b/core/src/main/java/dev/vml/es/acm/core/servlet/QueueCodeServlet.java
@@ -40,6 +40,9 @@ public class QueueCodeServlet extends SlingAllMethodsServlet {
     @Reference
     private ExecutionQueue executionQueue;
 
+    @Reference
+    private Executor executor;
+
     @Override
     protected void doPost(SlingHttpServletRequest request, SlingHttpServletResponse response) throws IOException {
         try {
@@ -50,15 +53,26 @@ protected void doPost(SlingHttpServletRequest request, SlingHttpServletResponse
                 return;
             }
 
-            ExecutionContextOptions contextOptions = new ExecutionContextOptions(
-                    ExecutionMode.RUN, request.getResourceResolver().getUserID());
             Code code = input.getCode();
-            Execution execution = executionQueue.submit(contextOptions, code).orElse(null);
-            if (execution == null) {
-                respondJson(response, error("Code execution cannot be queued!"));
+
+            try (ExecutionContext context =
+                         executor.createContext(ExecutionId.generate(), ExecutionMode.CHECK, input.getCode(), request.getResourceResolver())) {
+                Execution checkExecution = executor.execute(context);
+                if (checkExecution.getStatus() == ExecutionStatus.SKIPPED) {
+                    QueueOutput output = new QueueOutput(Collections.singletonList(checkExecution));
+                    respondJson(response, ok(String.format("Code from '%s' skipped execution", code.getId()), output));
+                    return;
+                }
+            } catch (Exception e) {
+                LOG.error("Code execution cannot be checked!", e);
+                respondJson(response, badRequest(String.format("Code execution cannot be checked! %s", e.getMessage()).trim()));
                 return;
             }
 
+            ExecutionContextOptions contextOptions = new ExecutionContextOptions(
+                    ExecutionMode.RUN, request.getResourceResolver().getUserID());
+
+            Execution execution = executionQueue.submit(contextOptions, code);
             QueueOutput output = new QueueOutput(Collections.singletonList(execution));
             respondJson(
                     response,
diff --git a/ui.config/src/main/content/jcr_root/apps/acm-config/osgiconfig/config/org.apache.sling.event.jobs.QueueConfiguration-acmexecutionqueue.config b/ui.config/src/main/content/jcr_root/apps/acm-config/osgiconfig/config/org.apache.sling.event.jobs.QueueConfiguration-acmexecutionqueue.config
index 38e7ed7e..eb3c7afd 100644
--- a/ui.config/src/main/content/jcr_root/apps/acm-config/osgiconfig/config/org.apache.sling.event.jobs.QueueConfiguration-acmexecutionqueue.config
+++ b/ui.config/src/main/content/jcr_root/apps/acm-config/osgiconfig/config/org.apache.sling.event.jobs.QueueConfiguration-acmexecutionqueue.config
@@ -1,8 +1,8 @@
 queue.name="AEM\ Content\ Manager\ Execution\ Queue"
 queue.topics=["dev/vml/es/acm/ExecutionQueue"]
 queue.priority="NORM"
-queue.type="UNORDERED"
-queue.maxparallel="15.0"
+queue.type="ORDERED"
+queue.maxparallel="1"
 queue.retries="0"
 queue.retrydelay="2000"
 queue.keepJobs="false"
diff --git a/ui.content.example/src/main/content/jcr_root/conf/acm/settings/script/auto/disabled/example/ACME-2_changed.groovy b/ui.content.example/src/main/content/jcr_root/conf/acm/settings/script/auto/disabled/example/ACME-2_changed.groovy
new file mode 100644
index 00000000..7e3ab5cf
--- /dev/null
+++ b/ui.content.example/src/main/content/jcr_root/conf/acm/settings/script/auto/disabled/example/ACME-2_changed.groovy
@@ -0,0 +1,7 @@
+boolean canRun() {
+    return conditions.notQueuedSelf() && conditions.changed()
+}
+
+void doRun() {
+    throw new RuntimeException("I should run when script content changes or when the instance changes after a failure!")
+}
diff --git a/ui.content.example/src/main/content/jcr_root/conf/acm/settings/script/auto/disabled/example/ACME-2_instance_changed.groovy b/ui.content.example/src/main/content/jcr_root/conf/acm/settings/script/auto/disabled/example/ACME-2_instance_changed.groovy
deleted file mode 100644
index 97968d1c..00000000
--- a/ui.content.example/src/main/content/jcr_root/conf/acm/settings/script/auto/disabled/example/ACME-2_instance_changed.groovy
+++ /dev/null
@@ -1,7 +0,0 @@
-boolean canRun() {
-    return conditions.idleSelf() && (conditions.contentChanged() || conditions.retryIfInstanceChanged())
-}
-
-void doRun() {
-    throw new RuntimeException("I should run when content changes or when the instance changes after a failure!")
-}
diff --git a/ui.content.example/src/main/content/jcr_root/conf/acm/settings/script/auto/enabled/example/ACME-20_once.groovy b/ui.content.example/src/main/content/jcr_root/conf/acm/settings/script/auto/enabled/example/ACME-20_once.groovy
index 43d06bbd..5f76b037 100644
--- a/ui.content.example/src/main/content/jcr_root/conf/acm/settings/script/auto/enabled/example/ACME-20_once.groovy
+++ b/ui.content.example/src/main/content/jcr_root/conf/acm/settings/script/auto/enabled/example/ACME-20_once.groovy
@@ -1,5 +1,5 @@
 boolean canRun() {
-    return conditions.idleSelf() && conditions.once()
+    return conditions.notQueuedSelf() && conditions.once()
 }
 
 void doRun() {
diff --git a/ui.content.example/src/main/content/jcr_root/conf/acm/settings/script/auto/enabled/example/ACME-21_every-hour.groovy b/ui.content.example/src/main/content/jcr_root/conf/acm/settings/script/auto/enabled/example/ACME-21_every-hour.groovy
index b223a9bf..14274e3d 100644
--- a/ui.content.example/src/main/content/jcr_root/conf/acm/settings/script/auto/enabled/example/ACME-21_every-hour.groovy
+++ b/ui.content.example/src/main/content/jcr_root/conf/acm/settings/script/auto/enabled/example/ACME-21_every-hour.groovy
@@ -1,5 +1,5 @@
 boolean canRun() {
-    return conditions.idleSelf() && conditions.everyHourAt(43)
+    return conditions.notQueuedSelf() && conditions.everyHourAt(43)
 }
 
 void doRun() {
diff --git a/ui.content.example/src/main/content/jcr_root/conf/acm/settings/script/auto/enabled/example/ACME-22_every-day.groovy b/ui.content.example/src/main/content/jcr_root/conf/acm/settings/script/auto/enabled/example/ACME-22_every-day.groovy
index 45a3fa64..b49192a5 100644
--- a/ui.content.example/src/main/content/jcr_root/conf/acm/settings/script/auto/enabled/example/ACME-22_every-day.groovy
+++ b/ui.content.example/src/main/content/jcr_root/conf/acm/settings/script/auto/enabled/example/ACME-22_every-day.groovy
@@ -1,5 +1,5 @@
 boolean canRun() {
-    return conditions.idleSelf() && conditions.everyDayAt("07:45")
+    return conditions.notQueuedSelf() && conditions.everyDayAt("07:45")
 }
 
 void doRun() {
diff --git a/ui.content.example/src/main/content/jcr_root/conf/acm/settings/script/auto/enabled/example/ACME-23_every-week.groovy b/ui.content.example/src/main/content/jcr_root/conf/acm/settings/script/auto/enabled/example/ACME-23_every-week.groovy
index 714f221d..2feec899 100644
--- a/ui.content.example/src/main/content/jcr_root/conf/acm/settings/script/auto/enabled/example/ACME-23_every-week.groovy
+++ b/ui.content.example/src/main/content/jcr_root/conf/acm/settings/script/auto/enabled/example/ACME-23_every-week.groovy
@@ -1,5 +1,5 @@
 boolean canRun() {
-    return conditions.idleSelf() && conditions.everyWeekAt("Monday", "07:48")
+    return conditions.notQueuedSelf() && conditions.everyWeekAt("Monday", "07:48")
 }
 
 void doRun() {
diff --git a/ui.content.example/src/main/content/jcr_root/conf/acm/settings/script/auto/enabled/example/ACME-24_every-month.groovy b/ui.content.example/src/main/content/jcr_root/conf/acm/settings/script/auto/enabled/example/ACME-24_every-month.groovy
index 6207d56f..30f075ab 100644
--- a/ui.content.example/src/main/content/jcr_root/conf/acm/settings/script/auto/enabled/example/ACME-24_every-month.groovy
+++ b/ui.content.example/src/main/content/jcr_root/conf/acm/settings/script/auto/enabled/example/ACME-24_every-month.groovy
@@ -1,5 +1,5 @@
 boolean canRun() {
-    return conditions.idleSelf() && conditions.everyMonthAt(21, "07:49")
+    return conditions.notQueuedSelf() && conditions.everyMonthAt(21, "07:49")
 }
 
 void doRun() {
diff --git a/ui.content/src/main/content/jcr_root/conf/acm/settings/snippet/available/core/acl/demo.yml b/ui.content/src/main/content/jcr_root/conf/acm/settings/snippet/available/core/acl/demo.yml
index 911b8764..bc969256 100644
--- a/ui.content/src/main/content/jcr_root/conf/acm/settings/snippet/available/core/acl/demo.yml
+++ b/ui.content/src/main/content/jcr_root/conf/acm/settings/snippet/available/core/acl/demo.yml
@@ -4,7 +4,7 @@ documentation: |
   Setup the ACLs for the demo users and groups.
 content: |
   boolean canRun() {
-    return conditions.idleSelf()
+    return conditions.notQueuedSelf()
   }
     
   void doRun() {
diff --git a/ui.content/src/main/content/jcr_root/conf/acm/settings/snippet/available/core/condition/idle.yml b/ui.content/src/main/content/jcr_root/conf/acm/settings/snippet/available/core/condition/not_queued.yml
similarity index 74%
rename from ui.content/src/main/content/jcr_root/conf/acm/settings/snippet/available/core/condition/idle.yml
rename to ui.content/src/main/content/jcr_root/conf/acm/settings/snippet/available/core/condition/not_queued.yml
index e3ba8991..cca10680 100644
--- a/ui.content/src/main/content/jcr_root/conf/acm/settings/snippet/available/core/condition/idle.yml
+++ b/ui.content/src/main/content/jcr_root/conf/acm/settings/snippet/available/core/condition/not_queued.yml
@@ -1,6 +1,6 @@
 group: Condition
-name: condition_idle
+name: condition_not_queued
 content: |
-  conditions.idle()
+  conditions.notQueued()
 documentation: |
   Similar to `conditions.notRunning()` but also checks if none of the scripts are queued for execution.
diff --git a/ui.content/src/main/content/jcr_root/conf/acm/settings/snippet/available/core/condition/idle_self.yml b/ui.content/src/main/content/jcr_root/conf/acm/settings/snippet/available/core/condition/not_queued_self.yml
similarity index 71%
rename from ui.content/src/main/content/jcr_root/conf/acm/settings/snippet/available/core/condition/idle_self.yml
rename to ui.content/src/main/content/jcr_root/conf/acm/settings/snippet/available/core/condition/not_queued_self.yml
index e1571a6a..687beecb 100644
--- a/ui.content/src/main/content/jcr_root/conf/acm/settings/snippet/available/core/condition/idle_self.yml
+++ b/ui.content/src/main/content/jcr_root/conf/acm/settings/snippet/available/core/condition/not_queued_self.yml
@@ -1,6 +1,6 @@
 group: Condition
-name: condition_idle_self
+name: condition_not_queued_self
 content: |
-  conditions.idleSelf()
+  conditions.notQueuedSelf()
 documentation: |
   Similar to `conditions.notRunningSelf()` but also checks if the script is not even queued for execution.
diff --git a/ui.content/src/main/content/jcr_root/conf/acm/settings/snippet/available/core/condition/retry_if_instance_changed.yml b/ui.content/src/main/content/jcr_root/conf/acm/settings/snippet/available/core/condition/retry_if_instance_changed.yml
index 97a171d9..bb094ef1 100644
--- a/ui.content/src/main/content/jcr_root/conf/acm/settings/snippet/available/core/condition/retry_if_instance_changed.yml
+++ b/ui.content/src/main/content/jcr_root/conf/acm/settings/snippet/available/core/condition/retry_if_instance_changed.yml
@@ -10,7 +10,7 @@ documentation: |
   For example:
   ```groovy
   boolean canRun() {
-    return conditions.idleSelf() && (conditions.contentChanged() || conditions.retryIfInstanceChanged())
+    return conditions.notQueuedSelf() && (conditions.contentChanged() || conditions.retryIfInstanceChanged())
   }
   
   void doRun() {
diff --git a/ui.content/src/main/content/jcr_root/conf/acm/settings/snippet/available/core/general/demo_processing.yml b/ui.content/src/main/content/jcr_root/conf/acm/settings/snippet/available/core/general/demo_processing.yml
index 1669891a..af3f69f0 100644
--- a/ui.content/src/main/content/jcr_root/conf/acm/settings/snippet/available/core/general/demo_processing.yml
+++ b/ui.content/src/main/content/jcr_root/conf/acm/settings/snippet/available/core/general/demo_processing.yml
@@ -2,7 +2,7 @@ group: General
 name: general_demo_processing
 content: |
   boolean canRun() {
-    return conditions.idleSelf()
+    return conditions.notQueuedSelf()
   }
     
   void doRun() {
diff --git a/ui.content/src/main/content/jcr_root/conf/acm/settings/snippet/available/core/repo/demo.yml b/ui.content/src/main/content/jcr_root/conf/acm/settings/snippet/available/core/repo/demo.yml
index e4aea15d..b04bce00 100644
--- a/ui.content/src/main/content/jcr_root/conf/acm/settings/snippet/available/core/repo/demo.yml
+++ b/ui.content/src/main/content/jcr_root/conf/acm/settings/snippet/available/core/repo/demo.yml
@@ -16,7 +16,7 @@ content: |
   }
     
   boolean canRun() {
-    return conditions.idleSelf()
+    return conditions.notQueuedSelf()
   }
     
   void doRun() {
diff --git a/ui.frontend/package.json b/ui.frontend/package.json
index 2e279cf0..c9a1de6e 100644
--- a/ui.frontend/package.json
+++ b/ui.frontend/package.json
@@ -14,7 +14,6 @@
   "dependencies": {
     "@adobe/react-spectrum": "^3.40.1",
     "@monaco-editor/react": "^4.6.0",
-    "@preact/signals-react": "^3.2.0",
     "@react-spectrum/toast": "^3.0.1",
     "@spectrum-icons/illustrations": "^3.6.20",
     "@spectrum-icons/workflow": "^4.2.19",
diff --git a/ui.frontend/src/App.tsx b/ui.frontend/src/App.tsx
index ee189447..545869db 100644
--- a/ui.frontend/src/App.tsx
+++ b/ui.frontend/src/App.tsx
@@ -1,18 +1,39 @@
 import { defaultTheme, Flex, Provider, View } from '@adobe/react-spectrum';
 import { ToastContainer } from '@react-spectrum/toast';
 import equal from 'fast-deep-equal';
-import { useEffect, useRef } from 'react';
+import { useEffect, useRef, useState } from 'react';
 import { Outlet } from 'react-router-dom';
 import './App.css';
+import { AppContext } from './AppContext';
 import Footer from './components/Footer';
 import Header from './components/Header';
-import { appState } from './hooks/app.ts';
 import router from './router';
 import { apiRequest } from './utils/api';
-import { State } from './utils/api.types';
+import { InstanceRole, InstanceType, State } from './utils/api.types';
 import { intervalToTimeout } from './utils/spectrum.ts';
 
 function App() {
+  const [state, setState] = useState<State>({
+    spaSettings: {
+      appStateInterval: 3000,
+      executionPollInterval: 1400,
+      scriptStatsLimit: 30,
+    },
+    healthStatus: {
+      healthy: true,
+      issues: [],
+    },
+    mockStatus: {
+      enabled: true,
+    },
+    instanceSettings: {
+      id: 'default',
+      timezoneId: 'UTC',
+      role: InstanceRole.AUTHOR,
+      type: InstanceType.CLOUD_CONTAINER,
+    },
+  });
+
   const isFetching = useRef(false);
 
   useEffect(() => {
@@ -27,12 +48,17 @@ function App() {
           operation: 'Fetch application state',
           url: '/apps/acm/api/state.json',
           method: 'get',
-          timeout: intervalToTimeout(appState.value.spaSettings.appStateInterval),
+          timeout: intervalToTimeout(state.spaSettings.appStateInterval),
           quiet: true,
         });
         const stateNew = response.data.data;
-        if (!equal(stateNew, appState.value)) {
-          appState.value = stateNew;
+        if (!equal(stateNew, state)) {
+          setState((prevState) => {
+            if (!equal(stateNew, prevState)) {
+              return stateNew;
+            }
+            return prevState;
+          });
         }
       } catch (error) {
         console.warn('Cannot fetch application state:', error);
@@ -42,10 +68,10 @@ function App() {
     };
 
     fetchState();
-    const intervalId = setInterval(fetchState, appState.value.spaSettings.appStateInterval);
+    const intervalId = setInterval(fetchState, state.spaSettings.appStateInterval);
     return () => clearInterval(intervalId);
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [appState.value.spaSettings.appStateInterval]);
+  }, [state.spaSettings.appStateInterval]);
 
   return (
     <Provider
@@ -59,18 +85,20 @@ function App() {
         flexDirection: 'column',
       }}
     >
-      <Flex direction="column" flex="1">
-        <View paddingX="size-200" paddingTop="size-200">
-          <Header />
-        </View>
-        <View paddingX="size-200" flex="1" UNSAFE_style={{ display: 'flex' }}>
-          <Outlet />
-        </View>
-        <View paddingX="size-200" paddingBottom="size-200">
-          <Footer />
-        </View>
-      </Flex>
-      <ToastContainer />
+      <AppContext.Provider value={state}>
+        <Flex direction="column" flex="1">
+          <View paddingX="size-200" paddingTop="size-200">
+            <Header />
+          </View>
+          <View paddingX="size-200" flex="1" UNSAFE_style={{ display: 'flex' }}>
+            <Outlet />
+          </View>
+          <View paddingX="size-200" paddingBottom="size-200">
+            <Footer />
+          </View>
+        </Flex>
+        <ToastContainer />
+      </AppContext.Provider>
     </Provider>
   );
 }
diff --git a/ui.frontend/src/AppContext.tsx b/ui.frontend/src/AppContext.tsx
new file mode 100644
index 00000000..1f22796a
--- /dev/null
+++ b/ui.frontend/src/AppContext.tsx
@@ -0,0 +1,6 @@
+import { createContext } from 'react';
+import { State } from './utils/api.types';
+
+const AppContext = createContext<State | undefined>(undefined);
+
+export { AppContext };
diff --git a/ui.frontend/src/components/ExecutionAbortButton.tsx b/ui.frontend/src/components/ExecutionAbortButton.tsx
index 6da71df1..c1854e6d 100644
--- a/ui.frontend/src/components/ExecutionAbortButton.tsx
+++ b/ui.frontend/src/components/ExecutionAbortButton.tsx
@@ -4,7 +4,7 @@ import Cancel from '@spectrum-icons/workflow/Cancel';
 import StopCircle from '@spectrum-icons/workflow/StopCircle';
 import React, { useState } from 'react';
 import { useDeepCompareEffect } from 'react-use';
-import { appState } from '../hooks/app.ts';
+import { useAppState } from '../hooks/app.ts';
 import { pollExecutionPending } from '../hooks/execution';
 import { apiRequest } from '../utils/api';
 import { Execution, ExecutionStatus, isExecutionPending, QueueOutput } from '../utils/api.types';
@@ -16,6 +16,8 @@ interface ExecutionAbortButtonProps {
 }
 
 const ExecutionAbortButton: React.FC<ExecutionAbortButtonProps> = ({ execution, onComplete }) => {
+  const appState = useAppState();
+
   const [showDialog, setShowDialog] = useState(false);
   const [isAborting, setIsAborting] = useState(false);
 
@@ -39,7 +41,7 @@ const ExecutionAbortButton: React.FC<ExecutionAbortButtonProps> = ({ execution,
         method: 'delete',
       });
 
-      const queuedExecution = await pollExecutionPending(execution.id, appState.value.spaSettings.executionPollInterval);
+      const queuedExecution = await pollExecutionPending(execution.id, appState.spaSettings.executionPollInterval);
       if (queuedExecution?.status === ExecutionStatus.ABORTED) {
         ToastQueue.positive('Code execution aborted successfully!', {
           timeout: ToastTimeoutQuick,
diff --git a/ui.frontend/src/components/HealthChecker.tsx b/ui.frontend/src/components/HealthChecker.tsx
index 4a214fe0..c3bd55b3 100644
--- a/ui.frontend/src/components/HealthChecker.tsx
+++ b/ui.frontend/src/components/HealthChecker.tsx
@@ -5,10 +5,13 @@ import Close from '@spectrum-icons/workflow/Close';
 import Help from '@spectrum-icons/workflow/Help';
 import Replay from '@spectrum-icons/workflow/Replay';
 import Settings from '@spectrum-icons/workflow/Settings';
-import { appState, healthIssues } from '../hooks/app.ts';
+import { useAppState } from '../hooks/app.ts';
 import { HealthIssueSeverity, instancePrefix, InstanceType } from '../utils/api.types';
 
 const HealthChecker = () => {
+  const appState = useAppState();
+  const healthIssues = appState.healthStatus.issues;
+
   const getSeverityVariant = (severity: HealthIssueSeverity): 'negative' | 'yellow' | 'neutral' => {
     switch (severity) {
       case HealthIssueSeverity.CRITICAL:
@@ -34,7 +37,7 @@ const HealthChecker = () => {
           <Flex flex="1" alignItems="center">
             <Button
               variant="negative"
-              isDisabled={appState.value.instanceSettings.type === InstanceType.CLOUD_CONTAINER}
+              isDisabled={appState.instanceSettings.type === InstanceType.CLOUD_CONTAINER}
               onPress={() => window.open(`${instancePrefix}/system/console/configMgr/dev.vml.es.acm.core.instance.HealthChecker`, '_blank')}
             >
               <Settings />
@@ -42,7 +45,7 @@ const HealthChecker = () => {
             </Button>
           </Flex>
           <Flex flex="1" justifyContent="center" alignItems="center">
-            <StatusLight variant={healthIssues.value.length === 0 ? 'positive' : 'negative'}>{healthIssues.value.length === 0 ? <>Healthy</> : <>Unhealthy &mdash; {healthIssues.value.length} issue(s)</>}</StatusLight>
+            <StatusLight variant={healthIssues.length === 0 ? 'positive' : 'negative'}>{healthIssues.length === 0 ? <>Healthy</> : <>Unhealthy &mdash; {healthIssues.length} issue(s)</>}</StatusLight>
           </Flex>
           <Flex flex="1" justifyContent="end" alignItems="center">
             <DialogTrigger>
@@ -85,7 +88,7 @@ const HealthChecker = () => {
           <Column>Message</Column>
         </TableHeader>
         <TableBody>
-          {(healthIssues.value || []).map((issue, index) => (
+          {(healthIssues || []).map((issue, index) => (
             <Row key={index}>
               <Cell>{index + 1}</Cell>
               <Cell>
diff --git a/ui.frontend/src/components/ScriptExecutor.tsx b/ui.frontend/src/components/ScriptExecutor.tsx
index a82e01c8..3c5067af 100644
--- a/ui.frontend/src/components/ScriptExecutor.tsx
+++ b/ui.frontend/src/components/ScriptExecutor.tsx
@@ -10,9 +10,9 @@ import Code from '@spectrum-icons/workflow/Code';
 import Help from '@spectrum-icons/workflow/Help';
 import Replay from '@spectrum-icons/workflow/Replay';
 import Settings from '@spectrum-icons/workflow/Settings';
-import React, { useEffect, useRef, useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
-import { appState } from '../hooks/app.ts';
+import { useAppState } from '../hooks/app.ts';
 import { apiRequest } from '../utils/api.ts';
 import { ExecutionOutput, ExecutionSummary, InstanceType } from '../utils/api.types.ts';
 import { isProduction } from '../utils/node';
@@ -21,9 +21,10 @@ import DateExplained from './DateExplained';
 import ExecutableIdValue from './ExecutableIdValue';
 import ExecutionsAbortButton from './ExecutionsAbortButton';
 import ExecutionStatusBadge from './ExecutionStatusBadge';
-import UserInfo from "./UserInfo";
+import UserInfo from './UserInfo';
 
 const ScriptExecutor = () => {
+  const appState = useAppState();
   const prefix = isProduction() ? '' : 'http://localhost:4502';
   const navigate = useNavigate();
 
@@ -40,7 +41,7 @@ const ScriptExecutor = () => {
           operation: 'Fetch queued executions',
           url: '/apps/acm/api/execution.json?queued=true&format=summary',
           method: 'get',
-          timeout: intervalToTimeout(appState.value.spaSettings.appStateInterval),
+          timeout: intervalToTimeout(appState.spaSettings.appStateInterval),
           quiet: true,
         });
         setExecutions(response.data.data.list);
@@ -51,9 +52,9 @@ const ScriptExecutor = () => {
       }
     };
     fetchExecutions();
-    const intervalId = setInterval(fetchExecutions, appState.value.spaSettings.appStateInterval);
+    const intervalId = setInterval(fetchExecutions, appState.spaSettings.appStateInterval);
     return () => clearInterval(intervalId);
-  }, []);
+  }, [appState.spaSettings.appStateInterval]);
 
   console.log('executions', executions);
 
@@ -81,7 +82,7 @@ const ScriptExecutor = () => {
             <ButtonGroup>
               <ExecutionsAbortButton selectedKeys={selectedIds(selectedKeys)} />
               <MenuTrigger>
-                <Button variant="negative" isDisabled={appState.value.instanceSettings.type === InstanceType.CLOUD_CONTAINER}>
+                <Button variant="negative" isDisabled={appState.instanceSettings.type === InstanceType.CLOUD_CONTAINER}>
                   <Settings />
                   <Text>Configure</Text>
                 </Button>
@@ -160,10 +161,18 @@ const ScriptExecutor = () => {
           {executions.map((execution, index) => (
             <Row key={execution.id}>
               <Cell>{index + 1}</Cell>
-              <Cell><ExecutableIdValue id={execution.executableId} /></Cell>
-              <Cell><UserInfo id={execution.userId} /></Cell>
-              <Cell><DateExplained value={execution.startDate} /></Cell>
-              <Cell><ExecutionStatusBadge value={execution.status} /></Cell>
+              <Cell>
+                <ExecutableIdValue id={execution.executableId} />
+              </Cell>
+              <Cell>
+                <UserInfo id={execution.userId} />
+              </Cell>
+              <Cell>
+                <DateExplained value={execution.startDate} />
+              </Cell>
+              <Cell>
+                <ExecutionStatusBadge value={execution.status} />
+              </Cell>
             </Row>
           ))}
         </TableBody>
diff --git a/ui.frontend/src/components/ScriptListRich.tsx b/ui.frontend/src/components/ScriptListRich.tsx
index bce6fa00..40891cef 100644
--- a/ui.frontend/src/components/ScriptListRich.tsx
+++ b/ui.frontend/src/components/ScriptListRich.tsx
@@ -4,7 +4,7 @@ import NotFound from '@spectrum-icons/illustrations/NotFound';
 import Magnify from '@spectrum-icons/workflow/Magnify';
 import React, { useCallback, useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
-import { appState } from '../hooks/app';
+import { useAppState } from '../hooks/app';
 import { useFormatter } from '../hooks/formatter';
 import { toastRequest } from '../utils/api';
 import { InstanceRole, isExecutionNegative, ScriptOutput, ScriptType } from '../utils/api.types';
@@ -21,6 +21,7 @@ type ScriptListRichProps = {
 };
 
 const ScriptListRich: React.FC<ScriptListRichProps> = ({ type }) => {
+  const appState = useAppState();
   const navigate = useNavigate();
   const formatter = useFormatter();
 
@@ -77,14 +78,14 @@ const ScriptListRich: React.FC<ScriptListRichProps> = ({ type }) => {
               {type === ScriptType.ENABLED || type === ScriptType.DISABLED ? (
                 <>
                   <ScriptToggleButton type={type} selectedKeys={selectedIds(selectedKeys)} onToggle={loadScripts} />
-                  {appState.value.instanceSettings.role == InstanceRole.AUTHOR && <ScriptSynchronizeButton selectedKeys={selectedIds(selectedKeys)} onSync={loadScripts} />}
+                  {appState.instanceSettings.role == InstanceRole.AUTHOR && <ScriptSynchronizeButton selectedKeys={selectedIds(selectedKeys)} onSync={loadScripts} />}
                 </>
               ) : null}
             </ButtonGroup>
           </Flex>
           <Flex flex="1" justifyContent="center" alignItems="center">
-            <StatusLight variant={appState.value.healthStatus.healthy ? 'positive' : 'negative'}>
-              {appState.value.healthStatus.healthy ? (
+            <StatusLight variant={appState.healthStatus.healthy ? 'positive' : 'negative'}>
+              {appState.healthStatus.healthy ? (
                 <Text>Executor active</Text>
               ) : (
                 <>
@@ -118,14 +119,14 @@ const ScriptListRich: React.FC<ScriptListRichProps> = ({ type }) => {
             <Text>Average Duration</Text>
             <ContextualHelp variant="info">
               <Heading>Explanation</Heading>
-              <Content>Duration is calculated based on the last {appState.value.spaSettings.scriptStatsLimit} completed executions (only succeeded or failed).</Content>
+              <Content>Duration is calculated based on the last {appState.spaSettings.scriptStatsLimit} completed executions (only succeeded or failed).</Content>
             </ContextualHelp>
           </Column>
           <Column width="2fr" align="end">
             <Text>Success Rate</Text>
             <ContextualHelp variant="info">
               <Heading>Explanation</Heading>
-              <Content>Success rate is calculated based on the last {appState.value.spaSettings.scriptStatsLimit} completed executions (only succeeded or failed).</Content>
+              <Content>Success rate is calculated based on the last {appState.spaSettings.scriptStatsLimit} completed executions (only succeeded or failed).</Content>
             </ContextualHelp>
           </Column>
         </TableHeader>
diff --git a/ui.frontend/src/components/ScriptListSimple.tsx b/ui.frontend/src/components/ScriptListSimple.tsx
index d842cbd8..8b9c84e8 100644
--- a/ui.frontend/src/components/ScriptListSimple.tsx
+++ b/ui.frontend/src/components/ScriptListSimple.tsx
@@ -3,7 +3,7 @@ import NotFound from '@spectrum-icons/illustrations/NotFound';
 import Settings from '@spectrum-icons/workflow/Settings';
 import React, { useCallback, useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
-import { appState } from '../hooks/app.ts';
+import { useAppState } from '../hooks/app.ts';
 import { toastRequest } from '../utils/api';
 import { InstanceType, ScriptOutput, ScriptType, instancePrefix } from '../utils/api.types';
 import ScriptsExtensionHelpButton from './ScriptsExtensionHelpButton.tsx';
@@ -14,6 +14,7 @@ type ScriptListSimpleProps = {
 };
 
 const ScriptListSimple: React.FC<ScriptListSimpleProps> = ({ type }) => {
+  const appState = useAppState();
   const [scripts, setScripts] = useState<ScriptOutput | null>(null);
   const scriptCount = scripts?.list?.length ?? 0;
   const [loading, setLoading] = useState<boolean>(true);
@@ -60,7 +61,7 @@ const ScriptListSimple: React.FC<ScriptListSimpleProps> = ({ type }) => {
               {type === ScriptType.MOCK ? (
                 <Button
                   variant="negative"
-                  isDisabled={appState.value.instanceSettings.type === InstanceType.CLOUD_CONTAINER}
+                  isDisabled={appState.instanceSettings.type === InstanceType.CLOUD_CONTAINER}
                   onPress={() => window.open(`${instancePrefix}/system/console/configMgr/dev.vml.es.acm.core.mock.MockHttpFilter`, '_blank')}
                 >
                   <Settings />
@@ -71,8 +72,8 @@ const ScriptListSimple: React.FC<ScriptListSimpleProps> = ({ type }) => {
           </Flex>
           <Flex flex="1" justifyContent="center" alignItems="center">
             {type === ScriptType.MOCK ? (
-              <StatusLight variant={appState.value.mockStatus.enabled ? (scriptCount > 0 ? 'positive' : 'neutral') : 'negative'}>
-                {appState.value.mockStatus.enabled ? scriptCount > 0 ? <Text>Installed ({scriptCount})</Text> : <Text>Not installed</Text> : <Text>Disabled</Text>}
+              <StatusLight variant={appState.mockStatus.enabled ? (scriptCount > 0 ? 'positive' : 'neutral') : 'negative'}>
+                {appState.mockStatus.enabled ? scriptCount > 0 ? <Text>Installed ({scriptCount})</Text> : <Text>Not installed</Text> : <Text>Disabled</Text>}
               </StatusLight>
             ) : null}
             {type === ScriptType.EXTENSION ? <StatusLight variant={scriptCount > 0 ? 'positive' : 'negative'}>{scriptCount > 0 ? <Text>Installed ({scriptCount})</Text> : <Text>Not installed</Text>}</StatusLight> : null}
diff --git a/ui.frontend/src/hooks/app.ts b/ui.frontend/src/hooks/app.ts
index 2aec6523..4c273f86 100644
--- a/ui.frontend/src/hooks/app.ts
+++ b/ui.frontend/src/hooks/app.ts
@@ -1,25 +1,11 @@
-import { computed, signal } from '@preact/signals-react';
-import { InstanceRole, InstanceType, State } from '../utils/api.types';
+import { useContext } from 'react';
+import { AppContext } from '../AppContext';
+import { State } from '../utils/api.types.ts';
 
-export const appState = signal<State>({
-  spaSettings: {
-    appStateInterval: 3000,
-    executionPollInterval: 1400,
-    scriptStatsLimit: 30,
-  },
-  healthStatus: {
-    healthy: true,
-    issues: [],
-  },
-  mockStatus: {
-    enabled: true,
-  },
-  instanceSettings: {
-    id: 'default',
-    timezoneId: 'UTC',
-    role: InstanceRole.AUTHOR,
-    type: InstanceType.CLOUD_CONTAINER,
-  },
-});
-
-export const healthIssues = computed(() => appState.value.healthStatus.issues);
+export function useAppState(): State {
+  const state = useContext(AppContext);
+  if (!state) {
+    throw new Error('Application state is not available!');
+  }
+  return state;
+}
diff --git a/ui.frontend/src/hooks/execution.ts b/ui.frontend/src/hooks/execution.ts
index 40ef2089..66d3016b 100644
--- a/ui.frontend/src/hooks/execution.ts
+++ b/ui.frontend/src/hooks/execution.ts
@@ -4,10 +4,11 @@ import { useInterval } from 'react-use';
 import { apiRequest } from '../utils/api';
 import { Execution, ExecutionStatus, isExecutionPending, QueueOutput } from '../utils/api.types';
 import { intervalToTimeout, ToastTimeoutQuick } from '../utils/spectrum';
-import { appState } from './app';
+import { useAppState } from './app';
 import { useFormatter } from './formatter';
 
 export const useExecutionPolling = (executionId: string | undefined | null, pollInterval: number) => {
+  const appState = useAppState();
   const [execution, setExecution] = useState<Execution | null>(null);
   const [executing, setExecuting] = useState<boolean>(!!executionId);
   const [loading, setLoading] = useState<boolean>(true);
@@ -56,7 +57,7 @@ export const useExecutionPolling = (executionId: string | undefined | null, poll
         pollExecutionState(executionId);
       }
     },
-    executing && executionId ? appState.value.spaSettings.executionPollInterval : null,
+    executing && executionId ? appState.spaSettings.executionPollInterval : null,
   );
 
   return { execution, setExecution, executing, setExecuting, loading };
diff --git a/ui.frontend/src/hooks/formatter.ts b/ui.frontend/src/hooks/formatter.ts
index 0cd6f2fd..ac67eddb 100644
--- a/ui.frontend/src/hooks/formatter.ts
+++ b/ui.frontend/src/hooks/formatter.ts
@@ -2,10 +2,11 @@ import { DateFormatter } from '@adobe/react-spectrum';
 import { useDateFormatter } from '@react-aria/i18n';
 import { formatDistance, formatDuration, intervalToDuration } from 'date-fns';
 import { toZonedTime } from 'date-fns-tz';
-import { appState } from './app';
+import { useAppState } from './app';
 
 export function useFormatter() {
-  const instanceTimezoneId = appState.value.instanceSettings.timezoneId;
+  const appState = useAppState();
+  const instanceTimezoneId = appState.instanceSettings.timezoneId;
   const instanceDateFormatter = useDateFormatter({
     dateStyle: 'long',
     timeStyle: 'short',
diff --git a/ui.frontend/src/pages/ConsolePage.tsx b/ui.frontend/src/pages/ConsolePage.tsx
index 902ae63c..baf8cddd 100644
--- a/ui.frontend/src/pages/ConsolePage.tsx
+++ b/ui.frontend/src/pages/ConsolePage.tsx
@@ -11,7 +11,7 @@ import ExecutionAbortButton from '../components/ExecutionAbortButton';
 import ExecutionCopyOutputButton from '../components/ExecutionCopyOutputButton';
 import ExecutionProgressBar from '../components/ExecutionProgressBar';
 import KeyboardShortcutsButton from '../components/KeyboardShortcutsButton';
-import { appState } from '../hooks/app';
+import { useAppState } from '../hooks/app';
 import { useCompilation } from '../hooks/code';
 import { useExecutionPolling } from '../hooks/execution';
 import { apiRequest, toastRequest } from '../utils/api';
@@ -20,11 +20,13 @@ import { ToastTimeoutQuick } from '../utils/spectrum.ts';
 import { StorageKeys } from '../utils/storage';
 
 const ConsolePage = () => {
+  const appState = useAppState();
   const [selectedTab, setSelectedTab] = useState<'code' | 'output'>('code');
   const [code, setCode] = useState<string | undefined>(() => localStorage.getItem(StorageKeys.EDITOR_CODE) || undefined);
   const [compiling, syntaxError, compileError, parseExecution] = useCompilation(code, (newCode) => localStorage.setItem(StorageKeys.EDITOR_CODE, newCode));
   const [queuedExecution, setQueuedExecution] = useState<Execution | null>(null);
-  const { execution, setExecution, executing, setExecuting } = useExecutionPolling(queuedExecution?.id || null, appState.value.spaSettings.executionPollInterval);
+
+  const { execution, setExecution, executing, setExecuting } = useExecutionPolling(queuedExecution?.id, appState.spaSettings.executionPollInterval);
   const [autoscroll, setAutoscroll] = useState<boolean>(true);
 
   useEffect(() => {
@@ -57,6 +59,12 @@ const ConsolePage = () => {
     setExecution(parseExecution);
   }, [parseExecution, setExecution]);
 
+  useEffect(() => {
+    if (!isExecutionPending(queuedExecution?.status)) {
+      setExecuting(false);
+    }
+  }, [queuedExecution, setExecuting]);
+
   const onDescribeFailed = (description: Description) => {
     console.error('Code description failed:', description);
     setExecution(description.execution);
diff --git a/ui.frontend/src/pages/ExecutionView.tsx b/ui.frontend/src/pages/ExecutionView.tsx
index 1f8ce04f..168f4419 100644
--- a/ui.frontend/src/pages/ExecutionView.tsx
+++ b/ui.frontend/src/pages/ExecutionView.tsx
@@ -16,7 +16,7 @@ import ExecutionAbortButton from '../components/ExecutionAbortButton';
 import ExecutionCopyOutputButton from '../components/ExecutionCopyOutputButton';
 import ExecutionProgressBar from '../components/ExecutionProgressBar';
 import ExecutionStatusBadge from '../components/ExecutionStatusBadge';
-import { appState } from '../hooks/app.ts';
+import { useAppState } from '../hooks/app.ts';
 import { useExecutionPolling } from '../hooks/execution';
 import { useFormatter } from '../hooks/formatter';
 import { useNavigationTab } from '../hooks/navigation';
@@ -25,10 +25,11 @@ import { Objects } from '../utils/objects';
 import { ToastTimeoutQuick } from '../utils/spectrum.ts';
 
 const ExecutionView = () => {
+  const appState = useAppState();
   const { executionId } = useParams<{ executionId: string }>();
   const formatter = useFormatter();
   const [autoscrollOutput, setAutoscrollOutput] = useState<boolean>(true);
-  const { execution, setExecution, loading } = useExecutionPolling(executionId, appState.value.spaSettings.executionPollInterval);
+  const { execution, setExecution, loading } = useExecutionPolling(executionId, appState.spaSettings.executionPollInterval);
   const [selectedTab, handleTabChange] = useNavigationTab('details');
   const navigate = useNavigate();
 
diff --git a/ui.frontend/src/pages/ScriptsPage.tsx b/ui.frontend/src/pages/ScriptsPage.tsx
index 634281bd..433f4a65 100644
--- a/ui.frontend/src/pages/ScriptsPage.tsx
+++ b/ui.frontend/src/pages/ScriptsPage.tsx
@@ -6,12 +6,13 @@ import FlashOn from '@spectrum-icons/workflow/FlashOn';
 import Hand from '@spectrum-icons/workflow/Hand';
 import ScriptListRich from '../components/ScriptListRich.tsx';
 import ScriptListSimple from '../components/ScriptListSimple.tsx';
-import { appState } from '../hooks/app.ts';
+import { useAppState } from '../hooks/app.ts';
 import { useNavigationTab } from '../hooks/navigation';
 import { ScriptType } from '../utils/api.types';
 import styles from './ScriptsPage.module.css';
 
 const ScriptsPage = () => {
+  const appState = useAppState();
   const [selectedTab, handleTabChange] = useNavigationTab('manual');
 
   return (
@@ -30,7 +31,7 @@ const ScriptsPage = () => {
             <CloseCircle />
             <Text>Disabled</Text>
           </Item>
-          {appState.value.mockStatus.enabled ? (
+          {appState.mockStatus.enabled ? (
             <Item aria-label="Mock scripts" key="mock">
               <Beaker />
               <Text>Mock</Text>
@@ -51,7 +52,7 @@ const ScriptsPage = () => {
           <Item key="disabled" aria-label="Disabled">
             <ScriptListRich type={ScriptType.DISABLED} />
           </Item>
-          {appState.value.mockStatus.enabled ? (
+          {appState.mockStatus.enabled ? (
             <Item key="mock" aria-label="Mock">
               <ScriptListSimple type={ScriptType.MOCK} />
             </Item>