diff --git a/erpnext/public/js/hub/PageContainer.vue b/erpnext/public/js/hub/PageContainer.vue
index 981c44e8f5..0bc6712056 100644
--- a/erpnext/public/js/hub/PageContainer.vue
+++ b/erpnext/public/js/hub/PageContainer.vue
@@ -39,8 +39,8 @@ function get_route_map() {
 		'marketplace/selling': Selling,
 		'marketplace/selling/:buyer/:item': Messages
 	}
-	const hub_registered = hub.settings.registered;
-	return hub_registered
+
+	return hub.is_seller_registered()
 		? Object.assign({}, read_only_routes, registered_routes)
 		: read_only_routes;
 }
diff --git a/erpnext/public/js/hub/marketplace.js b/erpnext/public/js/hub/marketplace.js
index bacca47545..bd9f64bcdd 100644
--- a/erpnext/public/js/hub/marketplace.js
+++ b/erpnext/public/js/hub/marketplace.js
@@ -93,6 +93,11 @@ erpnext.hub.Marketplace = class Marketplace {
 	}
 
 	show_register_dialog() {
+		if(frappe.session.user === 'Administrator') {
+			frappe.msgprint(__('You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.'));
+			return;
+		}
+
 		this.register_dialog = ProfileDialog(
 			__('Become a Seller'),
 			{