diff --git a/src/backend/looped/vehicle/keep_vehicle_repaired.cpp b/src/backend/looped/vehicle/keep_vehicle_repaired.cpp
index 90670ccf..13497c47 100644
--- a/src/backend/looped/vehicle/keep_vehicle_repaired.cpp
+++ b/src/backend/looped/vehicle/keep_vehicle_repaired.cpp
@@ -18,9 +18,12 @@ namespace big
 				return;
 			}
 
-			if (!entity::take_control_of(veh, 0))
+			if (*g_pointers->m_gta.m_is_session_started)
 			{
-				return;
+				if (!entity::take_control_of(veh, 0))
+				{
+					return;
+				}
 			}
 
 			if (VEHICLE::GET_DOES_VEHICLE_HAVE_DAMAGE_DECALS(veh))
diff --git a/src/backend/looped/vehicle/vehicle_god.cpp b/src/backend/looped/vehicle/vehicle_god.cpp
index 95d732d9..07e288f8 100644
--- a/src/backend/looped/vehicle/vehicle_god.cpp
+++ b/src/backend/looped/vehicle/vehicle_god.cpp
@@ -95,11 +95,12 @@ namespace big
 		{
 			if (g_local_player)
 			{
-				if (const auto personal_vehicle = mobile::mechanic::get_personal_cvehicle())
+				const auto personal_vehicle = mobile::mechanic::get_personal_cvehicle();
+				if (personal_vehicle)
 				{
 					apply_godmode_to_vehicle(personal_vehicle, true);
-					apply_godmode_to_vehicle(g_local_player->m_vehicle, personal_vehicle == g_local_player->m_vehicle);	
 				}
+				apply_godmode_to_vehicle(g_local_player->m_vehicle, personal_vehicle == g_local_player->m_vehicle);	
 			}
 		}