diff --git a/src/stores/schemes.ts b/src/stores/schemes.ts
index bea79d8..53b3da9 100644
--- a/src/stores/schemes.ts
+++ b/src/stores/schemes.ts
@@ -78,7 +78,7 @@ export function useCreateScheme(): (
     (name: string, type: SchemeType, description?: string) => {
       const newId = v4();
       updateSchemes((prev) => [
-        ...prev,
+        ...prev.filter((s) => !isNil(s)),
         {
           id: newId,
           name,
@@ -106,10 +106,12 @@ export function useUpdateScheme(
         reduce(
           prev,
           (acc, scheme) => {
-            if (isEqual(id, scheme.id)) {
-              acc.push(updater(scheme));
-            } else {
-              acc.push(scheme);
+            if (!isNil(scheme)) {
+              if (isEqual(id, scheme.id)) {
+                acc.push(updater(scheme));
+              } else {
+                acc.push(scheme);
+              }
             }
             return acc;
           },