diff --git a/client/vehicle/main.lua b/client/vehicle/main.lua
index 52d7068..7c96275 100644
--- a/client/vehicle/main.lua
+++ b/client/vehicle/main.lua
@@ -128,7 +128,7 @@ if not Config.Disable.Vehicle then
                 local engineRunning = GetIsVehicleEngineRunning(currentVehicle)
                 local rpm
 
-                if vehicleType == "LAND" then
+                if vehicleType == "LAND" or vehicleType == "MOTO" then
                     rpm = engineRunning and (GetVehicleCurrentRpm(currentVehicle) * 450) or 0
                 else
                     rpm = math.ceil(ESX.PlayerData.coords.z)
@@ -160,7 +160,14 @@ if not Config.Disable.Vehicle then
         inVehicle = true
         HUD.Data.Driver = currentSeat == -1 or false
         HUD.Data.Vehicle = currentVehicle
-        vehicleType = (vehicleClass == 15 or vehicleClass == 16) and "AIR" or "LAND"
+        vehicleType = "LAND"
+
+        if vehicleClass == 15 or vehicleClass == 16 then
+            vehicleType = "AIR"
+        elseif vehicleClass == 8 then
+            vehicleType = "MOTO"
+        end
+
         -- We have to check if he changed seat meantime
         driverCheckThread(currentVehicle)
 
diff --git a/web/src/assets/Components/Speedo.jsx b/web/src/assets/Components/Speedo.jsx
index b118390..fbdd2be 100644
--- a/web/src/assets/Components/Speedo.jsx
+++ b/web/src/assets/Components/Speedo.jsx
@@ -11,6 +11,7 @@ import {useSettingsStorageState} from "../Contexts/SettingsStorage";
 const VehType = {
     AIR:"AIR",
     LAND:"LAND",
+    MOTO: "MOTO",
 }
 
 const defaultObject = {
@@ -285,7 +286,7 @@ export const Speedo = (props) =>{
             }
             setOnIndex(onIndex => !onIndex)
         }
-        if(!indicators().seatbelt){
+        if(!indicators().seatbelt && vehType() !== VehType.MOTO){
             if(!settings().IndicatorSeatbeltSound && show()){
                 if(!props?.template && !checkSound()){
                     SeatbeltAlertSound.play();
@@ -409,7 +410,7 @@ export const Speedo = (props) =>{
     return(
         <div class={`${props?.template ? 'template-main-container' : 'speedo main-container'} ${!show() && !props?.template ? 'slideOut' : ''}`}>
 
-            <Show when={!indicators().seatbelt} keyed>
+            <Show when={!indicators().seatbelt && vehType() !== VehType.MOTO} keyed>
                 <div class="w-10 h-10 absolute top-[26%] -left-[25%]">
                     <SeatbeltIcon state={seatbeltState}/>
                 </div>
@@ -421,7 +422,7 @@ export const Speedo = (props) =>{
                 <AirHud/>
             </Show>
 
-            <Show when={vehType() === VehType.LAND} keyed>
+            <Show when={vehType() !== VehType.AIR} keyed>
                 <VehicleHud/>
             </Show>