diff --git a/packages/builder/src/components/deploy/DeployModal.svelte b/packages/builder/src/components/deploy/DeployModal.svelte
index 400f0dca4f..77f9a67cfe 100644
--- a/packages/builder/src/components/deploy/DeployModal.svelte
+++ b/packages/builder/src/components/deploy/DeployModal.svelte
@@ -31,9 +31,9 @@
         notifications.success(`Application published successfully`)
       }
 
-      if (analytics.requestFeedbackOnDeploy()) {
-        feedbackModal.show()
-      }
+      // if (analytics.requestFeedbackOnDeploy()) {
+      feedbackModal.show()
+      // }
     } catch (err) {
       analytics.captureException(err)
       notifications.error(`Error publishing app: ${err}`)
@@ -98,6 +98,16 @@
 </script>
 
 <Button secondary on:click={publishModal.show}>Publish</Button>
+<Modal bind:this={feedbackModal}>
+  <ModalContent
+    title="Enjoying Budibase?"
+    size="L"
+    showConfirmButton={false}
+    showCancelButton={false}
+  >
+    <FeedbackIframe on:finished={feedbackModal.hide} />
+  </ModalContent>
+</Modal>
 <Modal bind:this={publishModal}>
   <ModalContent
     title="Publish to Production"
diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte
index ac588cdf7d..6c229c1980 100644
--- a/packages/builder/src/pages/builder/portal/apps/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/index.svelte
@@ -127,7 +127,9 @@
       return
     }
     try {
-      const response = await del(`/api/applications/${selectedApp.prodId}`)
+      const response = await del(
+        `/api/applications/${selectedApp.prodId}?unpublish=1`
+      )
       if (response.status !== 200) {
         const json = await response.json()
         throw json.message
diff --git a/packages/server/src/api/controllers/application.js b/packages/server/src/api/controllers/application.js
index a60df2b9c2..7db8bacd0b 100644
--- a/packages/server/src/api/controllers/application.js
+++ b/packages/server/src/api/controllers/application.js
@@ -245,9 +245,10 @@ exports.update = async function (ctx) {
 
 exports.delete = async function (ctx) {
   const db = new CouchDB(ctx.params.appId)
+
   const result = await db.destroy()
   /* istanbul ignore next */
-  if (!env.isTest()) {
+  if (!env.isTest() && !ctx.query.unpublish) {
     await deleteApp(ctx.params.appId)
   }
   // make sure the app/role doesn't stick around after the app has been deleted