diff --git a/app/src/main/java/io/xpipe/app/comp/store/GuiDsStoreCreator.java b/app/src/main/java/io/xpipe/app/comp/store/GuiDsStoreCreator.java
index 02904e854..c9c4fe6d9 100644
--- a/app/src/main/java/io/xpipe/app/comp/store/GuiDsStoreCreator.java
+++ b/app/src/main/java/io/xpipe/app/comp/store/GuiDsStoreCreator.java
@@ -337,7 +337,7 @@ public class GuiDsStoreCreator extends MultiStepComp.Step<CompStructure<?>> {
         }
 
         // We didn't change anything
-        if (existingEntry.getStore().equals(store.getValue())) {
+        if (existingEntry != null && existingEntry.getStore().equals(store.getValue())) {
             return true;
         }
 
@@ -347,15 +347,6 @@ public class GuiDsStoreCreator extends MultiStepComp.Step<CompStructure<?>> {
             }
         }
 
-        if (!exists) {
-            if (name.getValue() != null
-                    && DataStorage.get().getStoreEntryIfPresent(name.getValue()).isPresent()) {
-                messageProp.setValue("Store with name " + name.getValue() + " does already exist");
-                changedSinceError.setValue(false);
-                return false;
-            }
-        }
-
         if (!validator.getValue().validate()) {
             var msg = validator
                     .getValue()