diff --git a/crm/api/doc.py b/crm/api/doc.py
index b5f81ca1..f0466817 100644
--- a/crm/api/doc.py
+++ b/crm/api/doc.py
@@ -201,8 +201,15 @@ def get_list_data(
 	if not rows:
 		rows = ["name"]
 
-	if not custom_view and frappe.db.exists("CRM View Settings", {"dt": doctype, "type": view_type}):
-		list_view_settings = frappe.get_doc("CRM View Settings", {"dt": doctype, "type": view_type})
+	default_view_filters = {
+		"dt": doctype,
+		"type": view_type,
+		"is_default": 1,
+		"user": frappe.session.user,
+	}
+
+	if not custom_view and frappe.db.exists("CRM View Settings", default_view_filters):
+		list_view_settings = frappe.get_doc("CRM View Settings", default_view_filters)
 		columns = frappe.parse_json(list_view_settings.columns)
 		rows = frappe.parse_json(list_view_settings.rows)
 		is_default = False
diff --git a/frontend/src/stores/views.js b/frontend/src/stores/views.js
index 2612b748..435bce9a 100644
--- a/frontend/src/stores/views.js
+++ b/frontend/src/stores/views.js
@@ -26,8 +26,8 @@ export const viewsStore = defineStore('crm-views', (doctype) => {
         if (view.public) {
           publicViews.value?.push(view)
         }
-        if (view.is_default && view.dt) {
-          defaultView.value[view.dt] = view
+        if (view.is_default && view.dt && view.type) {
+          defaultView.value[view.dt + ' ' + view.type] = view
         }
       }
       return views
@@ -35,12 +35,8 @@ export const viewsStore = defineStore('crm-views', (doctype) => {
   })
 
   function getView(view, type, doctype = null) {
-    if (!view && doctype) {
-      let _view = defaultView.value[doctype] || null
-      if (_view && _view['type'] !== type) {
-        _view = null
-      }
-      return _view
+    if (!view && doctype && type) {
+      return defaultView.value[doctype + ' ' + type] || null
     }
     return viewsByName[view]
   }