diff --git a/code/datums/components/riding/riding.dm b/code/datums/components/riding/riding.dm
index 74451e47c87..7ac6027944c 100644
--- a/code/datums/components/riding/riding.dm
+++ b/code/datums/components/riding/riding.dm
@@ -30,6 +30,8 @@
 	var/list/allowed_turf_typecache
 	/// allow typecache for only certain turfs, forbid to allow all but those. allow only certain turfs will take precedence.
 	var/list/forbid_turf_typecache
+	/// additional traits to add to anyone riding this vehicle
+	var/list/rider_traits = list(TRAIT_NO_FLOATING_ANIM)
 	/// We don't need roads where we're going if this is TRUE, allow normal movement in space tiles
 	var/override_allow_spacemove = FALSE
 	/// can anyone other than the rider unbuckle the rider?
@@ -96,7 +98,7 @@
 	for (var/trait in GLOB.movement_type_trait_to_flag)
 		if (HAS_TRAIT(parent, trait))
 			REMOVE_TRAIT(rider, trait, REF(src))
-	REMOVE_TRAIT(rider, TRAIT_NO_FLOATING_ANIM, REF(src))
+	rider.remove_traits(rider_traits, REF(src))
 	if(!movable_parent.has_buckled_mobs())
 		qdel(src)
 
@@ -115,7 +117,7 @@
 	for (var/trait in GLOB.movement_type_trait_to_flag)
 		if (HAS_TRAIT(parent, trait))
 			ADD_TRAIT(rider, trait, REF(src))
-	ADD_TRAIT(rider, TRAIT_NO_FLOATING_ANIM, REF(src))
+	rider.add_traits(rider_traits, REF(src))
 
 /// This proc is called when the rider attempts to grab the thing they're riding, preventing them from doing so.
 /datum/component/riding/proc/on_rider_try_pull(mob/living/rider_pulling, atom/movable/target, force)
diff --git a/code/datums/components/riding/riding_mob.dm b/code/datums/components/riding/riding_mob.dm
index 7f916f47e4b..f69e7261644 100644
--- a/code/datums/components/riding/riding_mob.dm
+++ b/code/datums/components/riding/riding_mob.dm
@@ -458,6 +458,7 @@
 /datum/component/riding/creature/goliath
 	keytype = /obj/item/key/lasso
 	vehicle_move_delay = 4
+	rider_traits = list(TRAIT_NO_FLOATING_ANIM, TRAIT_TENTACLE_IMMUNE)
 
 /datum/component/riding/creature/goliath/deathmatch
 	keytype = null