diff --git a/code/_onclick/click_hold.dm b/code/_onclick/click_hold.dm
index 996f7ed2bf3b..2a766580e366 100644
--- a/code/_onclick/click_hold.dm
+++ b/code/_onclick/click_hold.dm
@@ -95,11 +95,11 @@
 	// Add the hovered atom to the trace
 	LAZYADD(mouse_trace_history, over_obj)
 
-/client/MouseDrop(datum/over_object, datum/src_location, over_location, src_control, over_control, params)
+/client/MouseDrop(datum/src_object, datum/over_object, src_location, over_location, src_control, over_control, params)
 	. = ..()
 
-	if(src_location)
-		SEND_SIGNAL(src_location, COMSIG_ATOM_DROPPED_ON, over_object, src)
-
 	if(over_object)
-		SEND_SIGNAL(over_object, COMSIG_ATOM_DROP_ON, src_location, src)
+		SEND_SIGNAL(over_object, COMSIG_ATOM_DROPPED_ON, src_object, src)
+
+	if(src_object)
+		SEND_SIGNAL(src_object, COMSIG_ATOM_DROP_ON, over_object, src)