diff --git a/html/src/app.js b/html/src/app.js
index ec81b612..6b28621e 100644
--- a/html/src/app.js
+++ b/html/src/app.js
@@ -4820,7 +4820,7 @@ speechSynthesis.getVoices();
                     created_at: new Date().toJSON(),
                     type: 'group.queueReady',
                     imageUrl: group?.iconUrl,
-                    message: `Instance ready to join ${groupName}- ${worldName}`,
+                    message: `Instance ready to join ${groupName} - ${worldName}`,
                     location: instanceId,
                     groupName,
                     worldName
@@ -25794,7 +25794,11 @@ speechSynthesis.getVoices();
             this.showGroupDialog(groupId);
         }
         if (!API.currentUserGroups.has(groupId)) {
-            API.currentUserGroups.set(groupId);
+            API.currentUserGroups.set(groupId, {
+                id: groupId,
+                name: '',
+                iconUrl: ''
+            });
             if (this.friendLogInitStatus) {
                 API.getGroup({ groupId });
             }
diff --git a/html/src/index.pug b/html/src/index.pug
index e60b4c01..8cc7c698 100644
--- a/html/src/index.pug
+++ b/html/src/index.pug
@@ -1237,7 +1237,7 @@ html
                     el-form-item(:label="$t('dialog.new_instance.group_id')" v-if="newInstanceDialog.accessType === 'group'")
                         el-select(v-model="newInstanceDialog.groupId" clearable :placeholder="$t('dialog.new_instance.group_placeholder')" filterable style="width:100%")
                             el-option-group(:label="$t('dialog.new_instance.group_placeholder')")
-                                el-option.x-friend-item(v-for="group in API.currentUserGroups.values()" :key="group.id" :label="group.name" :value="group.id" style="height:auto;width:478px")
+                                el-option.x-friend-item(v-if="group" v-for="group in API.currentUserGroups.values()" :key="group.id" :label="group.name" :value="group.id" style="height:auto;width:478px")
                                     .avatar
                                         img(v-lazy="group.iconUrl")
                                     .detail
diff --git a/html/src/mixins/tabs/notifications.pug b/html/src/mixins/tabs/notifications.pug
index ec66e54a..e3c89938 100644
--- a/html/src/mixins/tabs/notifications.pug
+++ b/html/src/mixins/tabs/notifications.pug
@@ -20,7 +20,7 @@ mixin notificationsTab()
                         template(#content)
                             location(v-if="scope.row.details" :location="scope.row.details.worldId" :hint="scope.row.details.worldName" :grouphint="scope.row.details.groupName" :link="false")
                         span.x-link(v-text="scope.row.type" @click="showWorldDialog(scope.row.details.worldId)")
-                    el-tooltip(v-if="scope.row.type === 'group.queueReady'" placement="top")
+                    el-tooltip(v-else-if="scope.row.type === 'group.queueReady'" placement="top")
                         template(#content)
                             location(v-if="scope.row.location" :location="scope.row.location" :hint="scope.row.worldName" :grouphint="scope.row.groupName" :link="false")
                         span.x-link(v-text="scope.row.type" @click="showWorldDialog(scope.row.location)")