diff --git a/erpnext/hr/doctype/attendance/attendance.py b/erpnext/hr/doctype/attendance/attendance.py
index bcaeae4fe5b..e43d40ef567 100644
--- a/erpnext/hr/doctype/attendance/attendance.py
+++ b/erpnext/hr/doctype/attendance/attendance.py
@@ -166,6 +166,9 @@ def get_duplicate_attendance_record(employee, attendance_date, shift, name=None)
 
 
 def get_overlapping_shift_attendance(employee, attendance_date, shift, name=None):
+	if not shift:
+		return {}
+
 	attendance = frappe.qb.DocType("Attendance")
 	query = (
 		frappe.qb.from_(attendance)
diff --git a/erpnext/hr/doctype/attendance/test_attendance.py b/erpnext/hr/doctype/attendance/test_attendance.py
index ecd14c8a9ba..762d0f7567e 100644
--- a/erpnext/hr/doctype/attendance/test_attendance.py
+++ b/erpnext/hr/doctype/attendance/test_attendance.py
@@ -116,7 +116,7 @@ class TestAttendance(FrappeTestCase):
 		shift_2 = setup_shift_type(shift_type="Shift 2", start_time="11:00:00", end_time="12:00:00")
 
 		mark_attendance(employee, date, "Present", shift_1.name)
-		attendance = frappe.get_doc(
+		frappe.get_doc(
 			{
 				"doctype": "Attendance",
 				"employee": employee,