diff --git a/packages/builder/src/components/feedback/NPSFeedbackForm.svelte b/packages/builder/src/components/feedback/NPSFeedbackForm.svelte
index f181d59504..f9b1469ded 100644
--- a/packages/builder/src/components/feedback/NPSFeedbackForm.svelte
+++ b/packages/builder/src/components/feedback/NPSFeedbackForm.svelte
@@ -43,6 +43,8 @@
       comment,
     })
 
+    document.cookie = "feedbackSubmitted=true"
+
     dispatch("submitted")
   }
 </script>
diff --git a/packages/builder/src/pages/builder/app/[application]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/_layout.svelte
index efd68ab8dc..e2e9dcb40e 100644
--- a/packages/builder/src/pages/builder/app/[application]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_layout.svelte
@@ -35,11 +35,6 @@
     window.open(`/${application}`)
   }
 
-  function feedbackSubmitted() {
-    userShouldPostFeedback = false
-    document.cookie = "feedbackSubmitted=true"
-  }
-
   async function getPackage() {
     const res = await get(`/api/applications/${application}/appPackage`)
     const pkg = await res.json()
@@ -116,7 +111,7 @@
 {/await}
 
 {#if userShouldPostFeedback}
-  <NPSFeedbackForm on:submitted={feedbackSubmitted} />
+  <NPSFeedbackForm on:submitted={() => (userShouldPostFeedback = false)} />
 {/if}
 
 <style>