diff --git a/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py b/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py
index 2387a9fd..a7eb8595 100644
--- a/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py
+++ b/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py
@@ -14,8 +14,8 @@ def create(view):
 	view = frappe._dict(view)
 
 	view.filters = parse_json(view.filters) or {}
-	view.columns = parse_json(view.columns) or []
-	view.rows = parse_json(view.rows) or []
+	view.columns = parse_json(view.columns or '[]')
+	view.rows = parse_json(view.rows or '[]')
 
 	default_rows = sync_default_list_rows(view.doctype)
 	view.rows = view.rows + default_rows if default_rows else view.rows
diff --git a/frontend/src/pages/Deals.vue b/frontend/src/pages/Deals.vue
index 0c4eab6f..31ffa16a 100644
--- a/frontend/src/pages/Deals.vue
+++ b/frontend/src/pages/Deals.vue
@@ -137,6 +137,9 @@ const rows = computed(() => {
         }
       } else if (row == '_assign') {
         let assignees = JSON.parse(deal._assign) || []
+        if (!assignees.length && deal.deal_owner) {
+          assignees = [deal.deal_owner]
+        }
         _rows[row] = assignees.map((user) => ({
           name: user,
           image: getUser(user).user_image,
diff --git a/frontend/src/pages/Leads.vue b/frontend/src/pages/Leads.vue
index e9824880..82f8abdb 100644
--- a/frontend/src/pages/Leads.vue
+++ b/frontend/src/pages/Leads.vue
@@ -134,6 +134,9 @@ const rows = computed(() => {
         }
       } else if (row == '_assign') {
         let assignees = JSON.parse(lead._assign) || []
+        if (!assignees.length && lead.lead_owner) {
+          assignees = [lead.lead_owner]
+        }
         _rows[row] = assignees.map((user) => ({
           name: user,
           image: getUser(user).user_image,