diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm
index f906e669ece..bb42718266b 100644
--- a/code/game/objects/items/weapons/mop.dm
+++ b/code/game/objects/items/weapons/mop.dm
@@ -53,7 +53,7 @@
 
 /obj/item/mop/interact_with_atom(atom/target, mob/living/user, list/modifiers)
 	// Use the mop as a weapon.
-	if(user.a_intent != INTENT_HELP)
+	if(!isturf(target) && !isitem(target) && user.a_intent == INTENT_HARM)
 		return ..()
 
 	if(istype(target, /obj/item/reagent_containers/glass/bucket/))
diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm
index 47312248b06..cb30fbc53a0 100644
--- a/code/game/objects/structures/janicart.dm
+++ b/code/game/objects/structures/janicart.dm
@@ -63,7 +63,7 @@
 	update_icon(UPDATE_OVERLAYS)
 
 /obj/structure/janitorialcart/item_interaction(mob/living/user, obj/item/used, list/modifiers)
-	if(user.a_intent != INTENT_HELP)
+	if(user.a_intent == INTENT_HARM)
 		return ..()
 
 	if(handle_janitorial_equipment(user, used))