diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp
index 4b1fa3f4123..bf8a454f9e5 100644
--- a/src/server/scripts/Northrend/zone_storm_peaks.cpp
+++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp
@@ -195,10 +195,8 @@ public:
             if (!freed)
                 return;
 
-            if (!me->HasUnitState(UNIT_STATE_ONVEHICLE))
-            {
+            if (!me->GetVehicle())
                 me->DespawnOrUnsummon();
-            }
         }
 
         void SpellHit(Unit* caster, const SpellInfo* spell)