diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index ad2f305790d2..affbc28cdd45 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -71,7 +71,9 @@
 		return
 
 	// Click handled elsewhere. (These clicks are not affected by the next_move cooldown)
-	if (click(A, mods) || A.clicked(src, mods, location, params))
+	if(click(A, mods))
+		return
+	if(A.clicked(src, mods, location, params))
 		return
 
 	// Default click functions from here on.
diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm
index a8ed20f5c4b3..9c9784286d09 100644
--- a/code/_onclick/other_mobs.dm
+++ b/code/_onclick/other_mobs.dm
@@ -34,4 +34,4 @@
 	Have no reason to click on anything at all.
 */
 /mob/new_player/click()
-	return 1
+	return