diff --git a/app/src/main/java/io/xpipe/app/hub/comp/StoreChoicePopover.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreChoicePopover.java
index 00524cc18..5e7eb2d70 100644
--- a/app/src/main/java/io/xpipe/app/hub/comp/StoreChoicePopover.java
+++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreChoicePopover.java
@@ -150,8 +150,8 @@ public class StoreChoicePopover<T extends DataStore> {
             var addButton = creationCategory != null
                     ? new ButtonComp(null, new LabelGraphic.IconGraphic("mdi2p-plus"), () -> {
                                 StoreCreationDialog.showCreation(
-                                        DataStoreProviders.byId(creationCategory.getDefaultProvider())
-                                                .orElseThrow(),
+                                        creationCategory.getDefaultProvider() != null ?
+                                                DataStoreProviders.byId(creationCategory.getDefaultProvider()).orElseThrow() : null,
                                         creationCategory);
                             })
                             .describe(d -> d.nameKey("addConnection"))