diff --git a/app/src/main/java/io/xpipe/app/comp/source/store/GuiDsStoreCreator.java b/app/src/main/java/io/xpipe/app/comp/source/store/GuiDsStoreCreator.java
index 7aa302ef..ada80e59 100644
--- a/app/src/main/java/io/xpipe/app/comp/source/store/GuiDsStoreCreator.java
+++ b/app/src/main/java/io/xpipe/app/comp/source/store/GuiDsStoreCreator.java
@@ -267,6 +267,18 @@ public class GuiDsStoreCreator extends MultiStepComp.Step<CompStructure<?>> {
             }
         }
 
+        if (DataStorage.get().getStoreEntryIfPresent(name.getValue()).isPresent()) {
+            messageProp.setValue("Store with name " + name.getValue() + " does already exist");
+            changedSinceError.setValue(false);
+            return false;
+        }
+
+        if (DataStorage.get().getStoreEntryIfPresent(entry.getValue().getStore()).isPresent()) {
+            messageProp.setValue("A store with the same configuration does already exist");
+            changedSinceError.setValue(false);
+            return false;
+        }
+
         if (!validator.getValue().validate()) {
             var msg = validator
                     .getValue()