diff --git a/meshchatx/src/frontend/components/call/CallPage.vue b/meshchatx/src/frontend/components/call/CallPage.vue
index b6d339a..a483612 100644
--- a/meshchatx/src/frontend/components/call/CallPage.vue
+++ b/meshchatx/src/frontend/components/call/CallPage.vue
@@ -2116,7 +2116,7 @@ export default {
             callHistorySearch: "",
             callHistoryLimit: 10,
             callHistoryOffset: 0,
-            hasMoreCallHistory: true,
+            hasMoreCallHistory: false,
             isCallEnded: false,
             wasDeclined: false,
             wasVoicemail: false,
@@ -2643,7 +2643,6 @@ export default {
             try {
                 if (!loadMore) {
                     this.callHistoryOffset = 0;
-                    this.hasMoreCallHistory = true;
                 }
 
                 const response = await window.axios.get(
diff --git a/meshchatx/src/frontend/components/interfaces/AddInterfacePage.vue b/meshchatx/src/frontend/components/interfaces/AddInterfacePage.vue
index 225b948..523b28e 100644
--- a/meshchatx/src/frontend/components/interfaces/AddInterfacePage.vue
+++ b/meshchatx/src/frontend/components/interfaces/AddInterfacePage.vue
@@ -375,7 +375,10 @@
                         />
                     </div>
 
-                    <div v-if="['RNodeInterface', 'RNodeIPInterface'].includes(newInterfaceType)" class="mb-2 flex flex-wrap items-start gap-4">
+                    <div
+                        v-if="['RNodeInterface', 'RNodeIPInterface'].includes(newInterfaceType)"
+                        class="mb-2 flex flex-wrap items-start gap-4"
+                    >
                         <!-- interface spreading factor -->
                         <div class="flex-1">
                             <FormLabel class="mb-1">Spreading Factor</FormLabel>
@@ -1503,9 +1506,9 @@ export default {
                     airtime_limit_long: this.newInterfaceAirtimeLimitLong,
                     airtime_limit_short: this.newInterfaceAirtimeLimitShort,
 
-            // settings that can be added to any interface type
-            mode: this.sharedInterfaceSettings.mode || "full",
-            bitrate: this.sharedInterfaceSettings.bitrate,
+                    // settings that can be added to any interface type
+                    mode: this.sharedInterfaceSettings.mode || "full",
+                    bitrate: this.sharedInterfaceSettings.bitrate,
                     network_name: this.sharedInterfaceSettings.network_name,
                     passphrase: this.sharedInterfaceSettings.passphrase,
                     ifac_size: this.sharedInterfaceSettings.ifac_size,
diff --git a/meshchatx/src/frontend/components/messages/MessagesPage.vue b/meshchatx/src/frontend/components/messages/MessagesPage.vue
index d41a664..5ac0783 100644
--- a/meshchatx/src/frontend/components/messages/MessagesPage.vue
+++ b/meshchatx/src/frontend/components/messages/MessagesPage.vue
@@ -136,6 +136,7 @@ export default {
             conversationRefreshTimeout: null,
 
             config: null,
+            hasLoadedConversations: false,
             peers: {},
             selectedPeer: null,
 
@@ -348,7 +349,9 @@ export default {
         },
         async getConversations(append = false) {
             try {
-                if (this.conversations.length === 0 && !append) {
+                const shouldShowInitialLoading =
+                    !append && !this.hasLoadedConversations && this.conversations.length === 0;
+                if (shouldShowInitialLoading) {
                     this.isLoadingConversations = true;
                 }
 
@@ -368,6 +371,7 @@ export default {
                     this.conversations = newConversations;
                 }
 
+                this.hasLoadedConversations = true;
                 this.hasMoreConversations = newConversations.length === this.pageSize;
             } catch (e) {
                 console.log(e);