diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index d16852bf8..678a5e7d1 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -175,14 +175,14 @@ const setSettings = async ({ apiConfig, staticConfig, store }) => {
     if (source === 'name') return
     if (INSTANCE_IDENTIY_EXTERNAL.has(source)) return
     useInstanceStore().set({
-      value: config[source],
+      value: config[source] ?? INSTANCE_IDENTITY_DEFAULT_DEFINITIONS[source].default,
       path: `instanceIdentity.${source}`,
     })
   })
 
   Object.keys(INSTANCE_DEFAULT_CONFIG_DEFINITIONS).forEach((source) =>
     useInstanceStore().set({
-      value: config[source],
+      value: config[source] ?? INSTANCE_DEFAULT_CONFIG_DEFINITIONS[source].default,
       path: `prefsStorage.${source}`,
     }),
   )
diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js
index 41b6d315d..ea9c86c2e 100644
--- a/src/components/user_card/user_card.js
+++ b/src/components/user_card/user_card.js
@@ -362,7 +362,7 @@ export default {
       )
     },
     isDefaultAvatar() {
-      const baseAvatar = useInstanceStore().defaultAvatar
+      const baseAvatar = useInstanceStore().instanceIdenitity.defaultAvatar
       return (
         !this.$store.state.users.currentUser.profile_image_url ||
         this.$store.state.users.currentUser.profile_image_url.includes(
@@ -371,7 +371,7 @@ export default {
       )
     },
     isDefaultBanner() {
-      const baseBanner = useInstanceStore().defaultBanner
+      const baseBanner = useInstanceStore().instanceIdentity.defaultBanner
       return (
         !this.$store.state.users.currentUser.cover_photo ||
         this.$store.state.users.currentUser.cover_photo.includes(baseBanner)
diff --git a/src/components/who_to_follow_panel/who_to_follow_panel.js b/src/components/who_to_follow_panel/who_to_follow_panel.js
index e364dcf80..cd0524ecf 100644
--- a/src/components/who_to_follow_panel/who_to_follow_panel.js
+++ b/src/components/who_to_follow_panel/who_to_follow_panel.js
@@ -12,7 +12,7 @@ function showWhoToFollow(panel, reply) {
 
   panel.usersToFollow.forEach((toFollow, index) => {
     const user = shuffled[index]
-    const img = user.avatar || useInstanceStore().defaultAvatar
+    const img = user.avatar || useInstanceStore().instanceIdentity.defaultAvatar
     const name = user.acct
 
     toFollow.img = img
@@ -71,7 +71,7 @@ const WhoToFollowPanel = {
   },
   mounted: function () {
     this.usersToFollow = new Array(3).fill().map(() => ({
-      img: useInstanceStore().defaultAvatar,
+      img: useInstanceStore().instanceIdentity.defaultAvatar,
       name: '',
       id: 0,
     }))