diff --git a/app/back-end/builddata.json b/app/back-end/builddata.json
index bf3c9bf5..6d80cef8 100644
--- a/app/back-end/builddata.json
+++ b/app/back-end/builddata.json
@@ -1,4 +1,4 @@
 {
   "version": "0.46.0",
-  "build": 16915
+  "build": 16917
 }
\ No newline at end of file
diff --git a/app/back-end/modules/render-html/helpers/gdpr.js b/app/back-end/modules/render-html/helpers/gdpr.js
index 864b0992..43256b58 100644
--- a/app/back-end/modules/render-html/helpers/gdpr.js
+++ b/app/back-end/modules/render-html/helpers/gdpr.js
@@ -172,6 +172,10 @@ class Gdpr {
 
         let result = renderer.cachedItems.posts[configuration.privacyPolicyPostId];
 
+        if (!result) {
+            result = renderer.cachedItems.pages[configuration.privacyPolicyPostId];
+        }
+
         if (!result) {
             return '#not-found';
         }
diff --git a/app/src/components/Settings.vue b/app/src/components/Settings.vue
index 1681f98b..1ed6d123 100644
--- a/app/src/components/Settings.vue
+++ b/app/src/components/Settings.vue
@@ -2369,7 +2369,9 @@ export default {
             return sitemapLink;
         },
         postPages () {
-            return this.$store.state.currentSite.posts.filter(post => post.status.indexOf('published') > -1).map(post => post.id);
+            let posts = this.$store.state.currentSite.posts.filter(post => post.status.indexOf('published') > -1).map(post => post.id);
+            let pages = this.$store.state.currentSite.pages.filter(page => page.status.indexOf('published') > -1).map(page => page.id)
+            return posts.concat(pages);
         },
         dropdownItems () {
             return [
@@ -2884,7 +2886,8 @@ export default {
             }
         },
         customPostLabels (value) {
-            return this.$store.state.currentSite.posts.filter(post => post.id === value).map(post => post.title)[0];
+            let postsAndPages = this.$store.state.currentSite.posts.concat(this.$store.state.currentSite.pages);
+            return postsAndPages.filter(item => item.id === value).map(item => item.title)[0];
         },
         closeDropdown (refID) {
             this.$refs[refID].isOpen = false;