diff --git a/frappe/website/doctype/web_page/web_page.js b/frappe/website/doctype/web_page/web_page.js
index ab4f534c61..78b42856c9 100644
--- a/frappe/website/doctype/web_page/web_page.js
+++ b/frappe/website/doctype/web_page/web_page.js
@@ -19,6 +19,9 @@ frappe.ui.form.on('Web Page', {
 	insert_code: function(frm) {
 		frm.events.layout(frm);
 	},
+	onload: function(frm) {
+		frm.trigger('set_filters_on_web_page_blocks');
+	},
 	refresh: function(frm) {
 		if (frm.doc.template_path) {
 			frm.set_read_only();
@@ -40,7 +43,20 @@ frappe.ui.form.on('Web Page', {
 			frm.set_value('end_date', end_date);
 		}
 	},
-
+	content_type: function(frm) {
+		frm.trigger('set_filters_on_web_page_blocks');
+	},
+	set_filters_on_web_page_blocks: function(frm) {
+		if (frm.doc.content_type === 'Page Builder') {
+			frm.set_query('web_template', 'page_blocks', function() {
+				return {
+					"filters": {
+						"type": ['!=', 'Component']
+					}
+				};
+			});
+		}
+	},
 	set_meta_tags(frm) {
 		frappe.utils.set_meta_tag(frm.doc.route);
 	}