diff --git a/backend/src/schema/resolvers/userData.js b/backend/src/schema/resolvers/userData.js
index c73c46962..654f847fa 100644
--- a/backend/src/schema/resolvers/userData.js
+++ b/backend/src/schema/resolvers/userData.js
@@ -6,8 +6,10 @@ export default {
         MATCH (user:User { id: $id })
         WITH user
         OPTIONAL MATCH (p:Post)
-        WHERE (p)<-[:COMMENTS]-(:Comment)<-[:WROTE]-(user)
-        OR (user)-[:WROTE]->(p)
+        WHERE ((p)<-[:COMMENTS]-(:Comment)<-[:WROTE]-(user)
+        OR (user)-[:WROTE]->(p))
+        AND p.deleted = FALSE
+        AND p.disabled = FALSE
         RETURN { user: properties(user), posts: collect(properties(p)) }
         AS result
       `
diff --git a/webapp/pages/settings/data-download.vue b/webapp/pages/settings/data-download.vue
index 9cf1b1f8e..95a42d644 100644
--- a/webapp/pages/settings/data-download.vue
+++ b/webapp/pages/settings/data-download.vue
@@ -8,7 +8,7 @@
     <ds-text>{{ $t('settings.download.description') }}</ds-text>
     <ds-space margin="large" />
     <base-card v-for="image in imageList" :key="image.key">
-      <a :href="image.url" @click.prevent="downloadImage(image)">{{ image.title }}</a>
+      <a :href="image.url" target="_blank" rel="noopener noreferrer">{{ image.title }}</a>
       <ds-space margin="xxx-small" />
     </base-card>
   </base-card>
@@ -48,16 +48,6 @@ export default {
       document.body.appendChild(fileLink)
       fileLink.click()
     },
-    downloadImage({ url }) {
-      this.$axios.get(url, { responseType: 'blob' }).then((response) => {
-        const blob = new Blob([response.data])
-        const link = document.createElement('a')
-        link.href = URL.createObjectURL(blob)
-        link.download = url.replace(/^.+\//g, '')
-        link.click()
-        URL.revokeObjectURL(link.href)
-      })
-    },
   },
   apollo: {
     queryUserData: {
@@ -83,6 +73,7 @@ export default {
             return obj
           })
       },
+      fetchPolicy: 'cache-and-network',
     },
   },
 }