diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index 9b599ce3128..f0d146c60d8 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -491,6 +491,9 @@
 	if(user.throwing)
 		to_chat(user, span_warning("You can't jump in the middle of another jump!"))
 		return
+	if(!jumper.has_gravity())
+		to_chat(user, span_warning("You can't jump without gravity!"))
+		return
 
 	var/atom/target = get_edge_target_turf(user, user.dir) //gets the user's direction
 
diff --git a/code/modules/surgery/organs/augments_legs.dm b/code/modules/surgery/organs/augments_legs.dm
index e74d2dcdc95..544f8932e7a 100644
--- a/code/modules/surgery/organs/augments_legs.dm
+++ b/code/modules/surgery/organs/augments_legs.dm
@@ -131,10 +131,15 @@
 /datum/action/bhop/Trigger(left_click = TRUE)
 	if(!IsAvailable())
 		return
+
 	if(recharging_time > world.time)
 		to_chat(owner, span_warning("The boot's internal propulsion needs to recharge still!"))
 		return
 
+	if(!owner.has_gravity())
+		to_chat(owner, span_warning("You can't jump without gravity!"))
+		return
+
 	if(owner.throwing)
 		to_chat(owner, span_warning("You can't jump in the middle of another jump!"))
 		return