diff --git a/frappe/core/doctype/server_script/test_server_script.py b/frappe/core/doctype/server_script/test_server_script.py
index de858327a9..100e3c2790 100644
--- a/frappe/core/doctype/server_script/test_server_script.py
+++ b/frappe/core/doctype/server_script/test_server_script.py
@@ -122,7 +122,7 @@ class TestServerScript(unittest.TestCase):
 		self.assertEqual(frappe.get_doc('Server Script', 'test_return_value').execute_method(), 'hello')
 
 	def test_permission_query(self):
-		self.assertTrue('where (1 = 1)' in frappe.db.get_list('ToDo', return_query=1))
+		self.assertTrue('where (1 = 1)' in frappe.db.get_list('ToDo', run=False))
 		self.assertTrue(isinstance(frappe.db.get_list('ToDo'), list))
 
 	def test_attribute_error(self):
diff --git a/frappe/desk/listview.py b/frappe/desk/listview.py
index e733adf868..43ad104f0d 100644
--- a/frappe/desk/listview.py
+++ b/frappe/desk/listview.py
@@ -26,7 +26,7 @@ def get_group_by_count(doctype, current_filters, field):
 	current_filters = frappe.parse_json(current_filters)
 	subquery_condition = ''
 
-	subquery = frappe.get_all(doctype, filters=current_filters, return_query = True)
+	subquery = frappe.get_all(doctype, filters=current_filters, run=False)
 	if field == 'assigned_to':
 		subquery_condition = ' and `tabToDo`.reference_name in ({subquery})'.format(subquery = subquery)
 		return frappe.db.sql("""select `tabToDo`.owner as name, count(*) as count