diff --git a/frappe/model/db_query.py b/frappe/model/db_query.py
index 83ec5b1fa6..a5c2f7b723 100644
--- a/frappe/model/db_query.py
+++ b/frappe/model/db_query.py
@@ -317,14 +317,12 @@ class DatabaseQuery(object):
 				) and not self.group_by)
 
 			if not group_function_without_group_by:
-				if args.get("sort_field") and args.get("sort_order"):
-					args.order_by = "`tab{0}`.`{1}` {2}".format(self.doctype,
-						meta.sort_field or "modified", meta.sort_order or "desc")
+				args.order_by = "`tab{0}`.`{1}` {2}".format(self.doctype,
+					meta.get("sort_field") or "modified", meta.get("sort_order") or "desc")
 
 				# draft docs always on top
 				if meta.is_submittable:
-					args.order_by = "`tab{0}`.docstatus asc {1}"\
-						.format(self.doctype, (", " + args.order_by if args.order_by else ""))
+					args.order_by = "`tab{0}`.docstatus asc, {1}".format(self.doctype, args.order_by)
 
 	def check_sort_by_table(self, order_by):
 		if "." in order_by: