diff --git a/admin-spa/src/routes/Settings/Notifications/EditTemplate.tsx b/admin-spa/src/routes/Settings/Notifications/EditTemplate.tsx
index 1f13d7b..7a9f63c 100644
--- a/admin-spa/src/routes/Settings/Notifications/EditTemplate.tsx
+++ b/admin-spa/src/routes/Settings/Notifications/EditTemplate.tsx
@@ -207,13 +207,26 @@ export default function EditTemplate() {
     );
   }
 
+  // Don't render form until template data is loaded
+  if (isLoading || !template) {
+    return (
+      <SettingsLayout
+        title={__('Edit Template')}
+        description={__('Loading template...')}
+        isLoading={true}
+      >
+        <div className="text-muted-foreground">{__('Loading template data...')}</div>
+      </SettingsLayout>
+    );
+  }
+
   return (
     <SettingsLayout
-      title={template?.event_label || __('Edit Template')}
-      description={`${template?.channel_label || ''} - ${__('Customize the notification template. Use variables like {customer_name} to personalize messages.')}`}
+      title={template.event_label || __('Edit Template')}
+      description={`${template.channel_label || ''} - ${__('Customize the notification template. Use variables like {customer_name} to personalize messages.')}`}
       onSave={handleSave}
       saveLabel={__('Save Template')}
-      isLoading={isLoading}
+      isLoading={false}
       action={
         <div className="flex items-center gap-2">
           <Button