diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm
index 6ff15c93153..f7b34a42c68 100644
--- a/code/_onclick/other_mobs.dm
+++ b/code/_onclick/other_mobs.dm
@@ -544,7 +544,7 @@
 		changeNext_move(mmb_intent.clickcd)
 
 /mob/living/proc/jump_action(atom/A)
-	if(HAS_TRAIT(src, TRAIT_IMMERSED))
+	if(HAS_TRAIT(src, TRAIT_IMMERSED) && !HAS_TRAIT(src, TRAIT_SWIMMER))
 		to_chat(src, span_warning("I can't jump while floating."))
 		return
 
diff --git a/code/game/turfs/open/water.dm b/code/game/turfs/open/water.dm
index c2c7d4e4421..104fac9dfa5 100644
--- a/code/game/turfs/open/water.dm
+++ b/code/game/turfs/open/water.dm
@@ -356,7 +356,7 @@
 	var/current_direction = movedir || dir
 	var/speed = current_speed
 	if(HAS_TRAIT(moving, TRAIT_SWIMMER)) // more time to swim against the current
-		speed *= 2
+		speed *= 5
 	if(moving_loop)
 		moving_loop.direction = current_direction
 		moving_loop.delay = speed