diff --git a/BigBaseV2/src/services/vehicle_preview_service.cpp b/BigBaseV2/src/services/vehicle_preview_service.cpp
index 19e3a0ea..97db7f08 100644
--- a/BigBaseV2/src/services/vehicle_preview_service.cpp
+++ b/BigBaseV2/src/services/vehicle_preview_service.cpp
@@ -46,7 +46,7 @@ namespace big
 		
 		g_fiber_pool->queue_job([this]
 		{
-			while (g_running && g->spawn.preview_vehicle && g_gui.m_opened)
+			while (g_running && m_running && g->spawn.preview_vehicle && g_gui.m_opened)
 			{
 				auto location = ENTITY::GET_OFFSET_FROM_ENTITY_IN_WORLD_COORDS(PLAYER::PLAYER_PED_ID(), 2.5f, 2.5f, .5f);
 				if (m_current_veh == -1)
@@ -99,6 +99,11 @@ namespace big
 			g_thread_pool->push([this] { preview_loop(); });
 	}
 
+	void vehicle_preview_service::stop_preview()
+	{
+		m_running = false;
+	}
+
 	void vehicle_preview_service::load()
 	{
 		std::ifstream file(m_vehicle_file.get_path());
diff --git a/BigBaseV2/src/services/vehicle_preview_service.hpp b/BigBaseV2/src/services/vehicle_preview_service.hpp
index 48e9954b..b8f44364 100644
--- a/BigBaseV2/src/services/vehicle_preview_service.hpp
+++ b/BigBaseV2/src/services/vehicle_preview_service.hpp
@@ -26,6 +26,7 @@ namespace big
 		void preview_loop();
 
 		void set_preview_vehicle(const nlohmann::json& item);
+		void stop_preview();
 
 	private:
 		void load();
diff --git a/BigBaseV2/src/views/view_spawn.cpp b/BigBaseV2/src/views/view_spawn.cpp
index d4ad1f9b..4ab2e5c5 100644
--- a/BigBaseV2/src/views/view_spawn.cpp
+++ b/BigBaseV2/src/views/view_spawn.cpp
@@ -75,6 +75,7 @@ namespace big
 								vehicle::max_vehicle(veh);
 							}
 
+							g_vehicle_preview_service->stop_preview();
 						});
 
 						if (g->spawn.preview_vehicle && ImGui::IsItemHovered())