diff --git a/code/modules/mob/living/simple_animal/bot/floorbot.dm b/code/modules/mob/living/simple_animal/bot/floorbot.dm
index 0ba4023864..1fe0e84598 100644
--- a/code/modules/mob/living/simple_animal/bot/floorbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/floorbot.dm
@@ -335,6 +335,11 @@
 
 /mob/living/simple_animal/bot/floorbot/proc/repair(turf/target_turf)
 
+	if(check_bot_working(target_turf))
+		add_to_ignore(target_turf)
+		target = null
+		playsound(src, 'sound/effects/whistlereset.ogg', 50, TRUE)
+		return
 	if(isspaceturf(target_turf))
 		 //Must be a hull breach or in line mode to continue.
 		if(!is_hull_breach(target_turf) && !targetdirection)
@@ -418,3 +423,13 @@
 		repair(A)
 	else
 		..()
+
+/**
+  * Checks a given turf to see if another floorbot is there, working as well.
+  */
+/mob/living/simple_animal/bot/floorbot/proc/check_bot_working(turf/active_turf)
+	if(isturf(active_turf))
+		for(var/mob/living/simple_animal/bot/floorbot/robot in active_turf)
+			if(robot.mode == BOT_REPAIRING)
+				return TRUE
+	return FALSE
\ No newline at end of file
diff --git a/sound/effects/whistlereset.ogg b/sound/effects/whistlereset.ogg
new file mode 100644
index 0000000000..cf55c06ca8
Binary files /dev/null and b/sound/effects/whistlereset.ogg differ