diff --git a/src/UI/Store/UserConfigStore.tsx b/src/UI/Store/UserConfigStore.tsx
index fd5554b7a..56f08742c 100644
--- a/src/UI/Store/UserConfigStore.tsx
+++ b/src/UI/Store/UserConfigStore.tsx
@@ -344,7 +344,7 @@ export class UserConfigStore extends Singleton
                 return configs;
             let confNames = [...Object.keys(configs)];
             let curName = userConfig.userConfigName[type];
-            if (!curName)
+            if (!curName || !confNames.includes(curName))
                 curName = confNames[0];
             return configs[curName];
         }
@@ -605,6 +605,7 @@ export class UserConfigStore extends Singleton
                 await this.UpdateBoardOption(newName, type, store);
                 userConfig.userConfigName[type] = newName;
                 this.UpdateUserConfig(type, configs[newName]);
+                await this.UploadUserConfigNames(dbStore);
             }
             else
             {