diff --git a/src/routes/console/project-[project]/messaging/createMessageDropdown.svelte b/src/routes/console/project-[project]/messaging/createMessageDropdown.svelte
index db2850cca..f35e08683 100644
--- a/src/routes/console/project-[project]/messaging/createMessageDropdown.svelte
+++ b/src/routes/console/project-[project]/messaging/createMessageDropdown.svelte
@@ -56,7 +56,8 @@
                             $messageParams[$providerType] = {
                                 ...common,
                                 title: '',
-                                body: ''
+                                body: '',
+                                data: [['', '']]
                             };
                             break;
                     }
diff --git a/src/routes/console/project-[project]/messaging/message-[message]/+page.svelte b/src/routes/console/project-[project]/messaging/message-[message]/+page.svelte
index 9a094f8c0..5e680c334 100644
--- a/src/routes/console/project-[project]/messaging/message-[message]/+page.svelte
+++ b/src/routes/console/project-[project]/messaging/message-[message]/+page.svelte
@@ -84,7 +84,9 @@
                     Object.entries(data['data'] ?? {}).forEach(([key, value]) => {
                         dataEntries.push([key, value.toString()]);
                     });
-                    $messageParams[$providerType]['data'] = dataEntries || [['', '']];
+                    $messageParams[$providerType]['data'] = dataEntries.length
+                        ? dataEntries
+                        : [['', '']];
                 }
                 break;
         }
diff --git a/src/routes/console/project-[project]/messaging/message-[message]/pushPreview.svelte b/src/routes/console/project-[project]/messaging/message-[message]/pushPreview.svelte
index 956bdc8de..eefb59c0a 100644
--- a/src/routes/console/project-[project]/messaging/message-[message]/pushPreview.svelte
+++ b/src/routes/console/project-[project]/messaging/message-[message]/pushPreview.svelte
@@ -11,7 +11,7 @@
 <CardGrid>
     <div class="grid-1-2-col-1 u-flex-vertical u-cross-start u-gap-16">
         <Heading tag="h6" size="7">Preview</Heading>
-        <div class="u-flex u-main-center u-margin-block-start-24 u-width-full-line">
+        <div class="u-flex u-margin-block-start-24 u-width-full-line">
             <PushPhone title={message.data.title} body={message.data.body} />
         </div>
     </div>
diff --git a/src/routes/console/project-[project]/messaging/wizard/pushFormList.svelte b/src/routes/console/project-[project]/messaging/wizard/pushFormList.svelte
index 7b9b37982..b15e65d15 100644
--- a/src/routes/console/project-[project]/messaging/wizard/pushFormList.svelte
+++ b/src/routes/console/project-[project]/messaging/wizard/pushFormList.svelte
@@ -54,7 +54,7 @@
     let customData: [string, string][] = [];
 
     onMount(() => {
-        $messageParams[MessagingProviderType.Push].data = customData || [['', '']];
+        customData = $messageParams[MessagingProviderType.Push].data;
     });
 
     async function sendTestMessage() {