diff --git a/app/templates/admin/platform-homepage.html b/app/templates/admin/platform-homepage.html
index e4a2bdef..9e286a82 100644
--- a/app/templates/admin/platform-homepage.html
+++ b/app/templates/admin/platform-homepage.html
@@ -33,7 +33,8 @@
 {{ alert_dynamic(type='success', message_var='successMessage', show_condition='successMessage') }}
 
 <!-- Main Form -->
-<div x-show="!loading && page" class="bg-white dark:bg-gray-800 rounded-lg shadow-md overflow-hidden">
+<template x-if="!loading && page">
+<div class="bg-white dark:bg-gray-800 rounded-lg shadow-md overflow-hidden">
     <form @submit.prevent="savePage()">
         <!-- Template Selection -->
         <div class="p-6 border-b border-gray-200 dark:border-gray-700">
@@ -213,6 +214,7 @@
         </div>
     </form>
 </div>
+</template>
 {% endblock %}
 
 {% block extra_scripts %}
diff --git a/static/admin/js/messages.js b/static/admin/js/messages.js
index 80a963ea..4591649e 100644
--- a/static/admin/js/messages.js
+++ b/static/admin/js/messages.js
@@ -20,6 +20,7 @@ function adminMessages(initialConversationId = null) {
 
         // Loading states
         loading: true,
+        error: null,
         loadingConversations: false,
         loadingMessages: false,
         sendingMessage: false,