diff --git a/src/views/vehicle/view_persist_car.cpp b/src/views/vehicle/view_persist_car.cpp
index 26d529f0..0093e028 100644
--- a/src/views/vehicle/view_persist_car.cpp
+++ b/src/views/vehicle/view_persist_car.cpp
@@ -68,28 +68,18 @@ namespace big
 
 		ImGui::SameLine();
 
-		components::button("SAVE_VEHICLE"_T, []
-		{
-			if (PED::GET_VEHICLE_PED_IS_IN(self::ped, false) == 0)
-			{
-				g_notification_service->push_warning("PERSIST_CAR"_T.data(), "You must be in a vehicle. Please enter a vehicle before using load.");
-			}
-			else
-			{
-				save_vehicle(vehicle_file_name_input);
-			}
+		components::button("SAVE_VEHICLE"_T, [] {
+			if (!self::veh)
+				return g_notification_service->push_warning("PERSIST_CAR"_T.data(), "You must be in a vehicle. Please enter a vehicle before using load.");
+
+			save_vehicle(vehicle_file_name_input);
 		});
 
-		components::button("LOAD_VEHICLE"_T, []
-		{
-			if (PED::GET_VEHICLE_PED_IS_IN(self::ped, false) != 0)
-			{
-				g_notification_service->push_warning("PERSIST_CAR"_T.data(), "You must not be in a vehicle. Please exit your vehicle before using load.");
-			}
-			else
-			{
-				load_vehicle(selected_vehicle_file);
-			}
+		components::button("LOAD_VEHICLE"_T, [] {
+			if (self::veh)
+				return g_notification_service->push_warning("PERSIST_CAR"_T.data(), "You must not be in a vehicle. Please exit your vehicle before using load.");
+
+			load_vehicle(selected_vehicle_file);
 		});
 
 		ImGui::EndGroup();