diff --git a/src/services/vehicle/vehicle_control_service.cpp b/src/services/vehicle/vehicle_control_service.cpp
index e98a8480..942640d0 100644
--- a/src/services/vehicle/vehicle_control_service.cpp
+++ b/src/services/vehicle/vehicle_control_service.cpp
@@ -367,9 +367,6 @@ namespace big
 
 	void vehicle_control::tick()
 	{
-		if (!*g_pointers->m_is_session_started)
-			return;
-
 		m_controlled_vehicle_exists = m_controlled_vehicle.ptr && ENTITY::DOES_ENTITY_EXIST(m_controlled_vehicle.handle)
 		    && VEHICLE::IS_THIS_MODEL_A_CAR(ENTITY::GET_ENTITY_MODEL(m_controlled_vehicle.handle));
 
diff --git a/src/views/view_vehicle_control.cpp b/src/views/view_vehicle_control.cpp
index 32a122dc..f3e92ccf 100644
--- a/src/views/view_vehicle_control.cpp
+++ b/src/views/view_vehicle_control.cpp
@@ -8,7 +8,6 @@
 
 namespace big
 {
-
 	void render_doors_tab()
 	{
 		const char* const doornames[MAX_VEHICLE_DOORS]{
@@ -75,10 +74,10 @@ namespace big
 
 		for (int i = 0; i < MAX_VEHICLE_DOORS; i++)
 		{
-			ImGui::PushID(i);
 			if (!g_vehicle_control_service.m_controlled_vehicle.doors[i].valid)
 				continue;
 			ImGui::SetNextItemWidth(200);
+			ImGui::PushID(i);
 			if (ImGui::BeginCombo(doornames[i], locknames[(int)g_vehicle_control_service.m_controlled_vehicle.doors[i].lockstate]))
 			{
 				for (int lockindex = 0; lockindex < MAX_VEHICLE_LOCK_STATES; lockindex++)
@@ -94,7 +93,7 @@ namespace big
 			}
 
 			ImGui::SameLine(300);
-
+			
 			const auto button_label = g_vehicle_control_service.m_controlled_vehicle.doors[i].open ? "CLOSE"_T : "OPEN"_T;
 			if (components::button(button_label))
 			{
@@ -301,7 +300,7 @@ namespace big
 
 	void view::vehicle_control()
 	{
-		if (!g.window.vehicle_control.opened || !*g_pointers->m_is_session_started)
+		if (!g.window.vehicle_control.opened)
 			return;
 
 		ImGui::SetNextWindowPos(ImVec2(500.0f, 10.0f), ImGuiCond_FirstUseEver, ImVec2(0.0f, 0.0f));