diff --git a/code/modules/fishing/fishing_minigame.dm b/code/modules/fishing/fishing_minigame.dm
index cdec5c54be6..d2c38fb484f 100644
--- a/code/modules/fishing/fishing_minigame.dm
+++ b/code/modules/fishing/fishing_minigame.dm
@@ -86,6 +86,7 @@
 		QDEL_NULL(fishing_line)
 	if(lure)
 		QDEL_NULL(lure)
+	SStgui.close_uis(src)
 	user = null
 	used_rod = null
 	return ..()
@@ -148,6 +149,8 @@
 		complete(FALSE)
 
 /datum/fishing_challenge/proc/complete(win = FALSE, perfect_win = FALSE)
+	if(completed)
+		return
 	deltimer(next_phase_timer)
 	completed = TRUE
 	if(user)
@@ -156,7 +159,7 @@
 			var/seconds_spent = (world.time - start_time) * 0.1
 			if(!(FISHING_MINIGAME_RULE_NO_EXP in special_effects))
 				user.mind?.adjust_experience(/datum/skill/fishing, round(seconds_spent * FISHING_SKILL_EXP_PER_SECOND * experience_multiplier))
-				if(win && user.mind?.get_skill_level(/datum/skill/fishing) >= SKILL_LEVEL_LEGENDARY)
+				if(user.mind?.get_skill_level(/datum/skill/fishing) >= SKILL_LEVEL_LEGENDARY)
 					user.client?.give_award(/datum/award/achievement/skill/legendary_fisher, user)
 	if(win)
 		if(reward_path != FISHING_DUD)
diff --git a/code/modules/fishing/fishing_rod.dm b/code/modules/fishing/fishing_rod.dm
index 58936d29534..26810217f8c 100644
--- a/code/modules/fishing/fishing_rod.dm
+++ b/code/modules/fishing/fishing_rod.dm
@@ -118,11 +118,14 @@
 	return hook?.reason_we_cant_fish(target_fish_source)
 
 /obj/item/fishing_rod/proc/consume_bait(atom/movable/reward)
-	if(!reward)
+	// catching things that aren't fish or alive mobs doesn't consume baits.
+	if(isnull(reward) || isnull(bait))
 		return
-	var/mob/living/caught_mob = isliving(reward) ? reward : null
-	// catching non-fish, non-mob movables, or dead mobs (probably from a chasm) doesn't consume baits.
-	if(!bait || !isfish(reward) || !caught_mob || (caught_mob && caught_mob.stat == DEAD))
+	if(isliving(reward))
+		var/mob/living/caught_mob = reward
+		if(caught_mob.stat == DEAD)
+			return
+	else if(!isfish(reward))
 		return
 	QDEL_NULL(bait)
 	update_icon()
@@ -208,7 +211,7 @@
 	SIGNAL_HANDLER
 	. = NONE
 
-	if(!CheckToolReach(src, source.target, cast_range))
+	if(!isturf(source.origin) || !isturf(source.target) || !CheckToolReach(src, source.target, cast_range))
 		SEND_SIGNAL(source, COMSIG_FISHING_LINE_SNAPPED) //Stepped out of range or los interrupted
 		return BEAM_CANCEL_DRAW
 
diff --git a/tgui/packages/tgui/interfaces/Fishing.tsx b/tgui/packages/tgui/interfaces/Fishing.tsx
index 294a40a2653..50e19fb8c53 100644
--- a/tgui/packages/tgui/interfaces/Fishing.tsx
+++ b/tgui/packages/tgui/interfaces/Fishing.tsx
@@ -4,7 +4,7 @@ import { randomInteger, randomNumber, randomPick, randomProb } from 'common/rand
 import { useDispatch } from 'common/redux';
 import { Component } from 'inferno';
 import { resolveAsset } from '../assets';
-import { backendSuspendStart, useBackend } from '../backend';
+import { useBackend } from '../backend';
 import { Icon, KeyListener } from '../components';
 import { globalEvents, KeyEvent } from '../events';
 import { Window } from '../layouts';
@@ -408,10 +408,8 @@ class FishingMinigame extends Component<
 
     if (newCompletion <= 0 && !this.no_escape) {
       this.props.lose();
-      dispatch(backendSuspendStart());
     } else if (newCompletion >= 100) {
       this.props.win();
-      dispatch(backendSuspendStart());
     }
 
     return newState;