diff --git a/[core]/es_extended/client/functions.lua b/[core]/es_extended/client/functions.lua
index 58252a0f..8c35eae6 100644
--- a/[core]/es_extended/client/functions.lua
+++ b/[core]/es_extended/client/functions.lua
@@ -391,7 +391,7 @@ function ESX.UI.Menu.Close(menuType, namespace, name, cancel)
                 else
                     local menu = ESX.UI.Menu.Opened[i]
                     ESX.UI.Menu.RegisteredTypes[menu.type].close(menu.namespace, menu.name)
-    
+
                     if type(menu.cancel) ~= "nil" then
                         menu.cancel(menu.data, menu)
                     end
@@ -412,7 +412,7 @@ function ESX.UI.Menu.CloseAll(cancel)
             else
                 local menu = ESX.UI.Menu.Opened[i]
                 ESX.UI.Menu.RegisteredTypes[menu.type].close(menu.namespace, menu.name)
-    
+
                 if type(menu.cancel) ~= "nil" then
                     menu.cancel(menu.data, menu)
                 end
@@ -1585,6 +1585,11 @@ function ESX.GetVehicleTypeClient(model)
     if not IsModelInCdimage(model) then
         return false
     end
+
+    if not IsModelAVehicle(model) then
+        return false
+    end
+
     if mismatchedTypes[model] then
         return mismatchedTypes[model]
     end