diff --git a/src/lua/bindings/scr_patch.cpp b/src/lua/bindings/scr_patch.cpp
index 1e27649b..1ffbeb77 100644
--- a/src/lua/bindings/scr_patch.cpp
+++ b/src/lua/bindings/scr_patch.cpp
@@ -25,6 +25,12 @@ namespace lua::scr_patch
 		module->m_registered_script_patches.push_back(std::make_unique<scr_patch>(*this));
 	}
 
+	scr_patch::~scr_patch()
+	{
+		disable();
+		big::g_script_patcher_service->remove_patch(m_patch_name);
+	}
+
 	void scr_patch::enable()
 	{
 		if (!m_enable)
diff --git a/src/lua/bindings/scr_patch.hpp b/src/lua/bindings/scr_patch.hpp
index 2e509366..8d771a6d 100644
--- a/src/lua/bindings/scr_patch.hpp
+++ b/src/lua/bindings/scr_patch.hpp
@@ -2,7 +2,7 @@
 
 namespace lua::scr_patch
 {
-	struct scr_patch
+	class scr_patch
 	{
 		rage::joaat_t m_script;
 		std::string m_patch_name;
@@ -21,6 +21,7 @@ namespace lua::scr_patch
 		// Param: patch_: table: The bytes to be written into the script's bytecode.
 		// Adds a patch for the specified script.
 		explicit scr_patch(const std::string& script_name, const std::string& patch_name, const std::string& pattern, const int offset, sol::table patch_, sol::this_state state);
+		~scr_patch();
 
 		// Lua API: Function
 		// Class: scr_patch
diff --git a/src/lua/lua_module.cpp b/src/lua/lua_module.cpp
index 2e0a7c43..562c7825 100644
--- a/src/lua/lua_module.cpp
+++ b/src/lua/lua_module.cpp
@@ -126,6 +126,7 @@ namespace big
 		{
 			std::lock_guard guard(m_registered_scripts_mutex);
 			m_registered_scripts.clear();
+			m_registered_script_patches.clear();
 		}
 
 		for (const auto owned_tab : m_owned_tabs)
diff --git a/src/services/script_patcher/script_patch.hpp b/src/services/script_patcher/script_patch.hpp
index e577be74..8ea866c5 100644
--- a/src/services/script_patcher/script_patch.hpp
+++ b/src/services/script_patcher/script_patch.hpp
@@ -1,34 +1,39 @@
-#pragma once
-#include "memory/pattern.hpp"
-
-namespace big
-{
-	struct script_data;
-
-	class script_patch
-	{
-		rage::joaat_t m_script;
-		const memory::pattern m_pattern;
-		std::string m_name;
-		int32_t m_offset;
-		std::vector<uint8_t> m_patch;
-		std::vector<uint8_t> m_original;
-		bool* m_bool;
-		int32_t m_ip;
-
-		static uint8_t* get_code_address(script_data* data, uint32_t index);
-		static const std::optional<uint32_t> get_code_location_by_pattern(script_data* data, const memory::pattern& pattern);
-
-	public:
-		void enable(script_data* data);
-		void disable(script_data* data);
-
-		inline rage::joaat_t get_script()
-		{
-			return m_script;
-		}
-
-		script_patch(rage::joaat_t script, std::string name, const memory::pattern pattern, int32_t offset, std::vector<uint8_t> patch, bool* enable_bool);
-		void update(script_data* data);
-	};
+#pragma once
+#include "memory/pattern.hpp"
+
+namespace big
+{
+	struct script_data;
+
+	class script_patch
+	{
+		rage::joaat_t m_script;
+		const memory::pattern m_pattern;
+		std::string m_name;
+		int32_t m_offset;
+		std::vector<uint8_t> m_patch;
+		std::vector<uint8_t> m_original;
+		bool* m_bool;
+		int32_t m_ip;
+
+		static uint8_t* get_code_address(script_data* data, uint32_t index);
+		static const std::optional<uint32_t> get_code_location_by_pattern(script_data* data, const memory::pattern& pattern);
+
+	public:
+		void enable(script_data* data);
+		void disable(script_data* data);
+
+		inline rage::joaat_t get_script()
+		{
+			return m_script;
+		}
+
+		inline std::string get_name()
+		{
+			return m_name;
+		}
+
+		script_patch(rage::joaat_t script, std::string name, const memory::pattern pattern, int32_t offset, std::vector<uint8_t> patch, bool* enable_bool);
+		void update(script_data* data);
+	};
 }
\ No newline at end of file
diff --git a/src/services/script_patcher/script_patcher_service.cpp b/src/services/script_patcher/script_patcher_service.cpp
index 37cddb1f..8466a9c6 100644
--- a/src/services/script_patcher/script_patcher_service.cpp
+++ b/src/services/script_patcher/script_patcher_service.cpp
@@ -1,101 +1,116 @@
-#include "script_patcher_service.hpp"
-
-#include "script_data.hpp"
-#include "script_patch.hpp"
-
-#include <script/scrProgram.hpp>
-
-namespace big
-{
-	script_patcher_service::script_patcher_service()
-	{
-		g_script_patcher_service = this;
-	}
-
-	script_patcher_service::~script_patcher_service()
-	{
-		m_script_data.clear();
-		m_script_patches.clear();
-		g_script_patcher_service = nullptr;
-	}
-
-	script_data* script_patcher_service::get_data_for_script(rage::joaat_t script)
-	{
-		for (auto& p : m_script_data)
-		{
-			if (p.first == script)
-			{
-				return p.second.get();
-			}
-		}
-
-		return nullptr;
-	}
-
-	bool script_patcher_service::does_script_have_patches(rage::joaat_t script)
-	{
-		for (auto& p : m_script_patches)
-		{
-			if (p.get_script() == script)
-				return true;
-		}
-
-		return false;
-	}
-
-	void script_patcher_service::create_data_for_script(rage::scrProgram* program)
-	{
-		auto pages = new uint8_t*[program->get_num_code_pages()];
-
-		for (auto i = 0u; i < program->get_num_code_pages(); i++)
-		{
-			pages[i] = new uint8_t[program->get_code_page_size(i)];
-			std::memcpy(pages[i], program->get_code_page(i), program->get_code_page_size(i));
-		}
-
-		m_script_data.emplace(program->m_name_hash, std::make_unique<script_data>(program->m_code_size, pages, program->get_num_code_pages()));
-	}
-
-	void script_patcher_service::update_all_patches_for_script(rage::joaat_t script)
-	{
-		auto data = get_data_for_script(script);
-
-		for (auto& p : m_script_patches)
-			if (p.get_script() == script)
-				p.update(data);
-	}
-
-	void script_patcher_service::add_patch(script_patch&& patch)
-	{
-		m_script_patches.push_back(std::move(patch));
-	}
-
-	void script_patcher_service::on_script_load(rage::scrProgram* program)
-	{
-		if (get_data_for_script(program->m_name_hash) == nullptr && does_script_have_patches(program->m_name_hash))
-		{
-			create_data_for_script(program);
-			update_all_patches_for_script(program->m_name_hash);
-		}
-	}
-
-	uint8_t** script_patcher_service::get_script_bytecode(rage::joaat_t script)
-	{
-		if (auto data = get_data_for_script(script))
-			return data->m_bytecode;
-
-		return nullptr;
-	}
-
-	void script_patcher_service::update()
-	{
-		for (auto& p : m_script_patches)
-		{
-			auto data = get_data_for_script(p.get_script());
-			if (data)
-			{
-				p.update(data);
-			}
-		}
-	}
+#include "script_patcher_service.hpp"
+
+#include "script_data.hpp"
+#include "script_patch.hpp"
+
+#include <script/scrProgram.hpp>
+
+namespace big
+{
+	script_patcher_service::script_patcher_service()
+	{
+		g_script_patcher_service = this;
+	}
+
+	script_patcher_service::~script_patcher_service()
+	{
+		m_script_data.clear();
+		m_script_patches.clear();
+		g_script_patcher_service = nullptr;
+	}
+
+	script_data* script_patcher_service::get_data_for_script(rage::joaat_t script)
+	{
+		for (auto& p : m_script_data)
+		{
+			if (p.first == script)
+			{
+				return p.second.get();
+			}
+		}
+
+		return nullptr;
+	}
+
+	bool script_patcher_service::does_script_have_patches(rage::joaat_t script)
+	{
+		for (auto& p : m_script_patches)
+		{
+			if (p.get_script() == script)
+				return true;
+		}
+
+		return false;
+	}
+
+	void script_patcher_service::create_data_for_script(rage::scrProgram* program)
+	{
+		auto pages = new uint8_t*[program->get_num_code_pages()];
+
+		for (auto i = 0u; i < program->get_num_code_pages(); i++)
+		{
+			pages[i] = new uint8_t[program->get_code_page_size(i)];
+			std::memcpy(pages[i], program->get_code_page(i), program->get_code_page_size(i));
+		}
+
+		m_script_data.emplace(program->m_name_hash, std::make_unique<script_data>(program->m_code_size, pages, program->get_num_code_pages()));
+	}
+
+	void script_patcher_service::update_all_patches_for_script(rage::joaat_t script)
+	{
+		auto data = get_data_for_script(script);
+
+		for (auto& p : m_script_patches)
+			if (p.get_script() == script)
+				p.update(data);
+	}
+
+	void script_patcher_service::add_patch(script_patch&& patch)
+	{
+		m_script_patches.push_back(std::move(patch));
+	}
+
+	void script_patcher_service::remove_patch(std::string_view patch_name)
+	{
+		for (auto it = m_script_patches.begin(); it != m_script_patches.end();)
+		{
+			if (it->get_name() == patch_name)
+			{
+				it = m_script_patches.erase(it);
+			}
+			else
+			{
+				++it;
+			}
+		}
+	}
+
+	void script_patcher_service::on_script_load(rage::scrProgram* program)
+	{
+		if (get_data_for_script(program->m_name_hash) == nullptr && does_script_have_patches(program->m_name_hash))
+		{
+			create_data_for_script(program);
+			update_all_patches_for_script(program->m_name_hash);
+		}
+	}
+
+	uint8_t** script_patcher_service::get_script_bytecode(rage::joaat_t script)
+	{
+		if (auto data = get_data_for_script(script))
+			return data->m_bytecode;
+
+		return nullptr;
+	}
+
+	void script_patcher_service::update()
+	{
+		for (auto& p : m_script_patches)
+		{
+			auto data = get_data_for_script(p.get_script());
+			if (data)
+			{
+				p.update(data);
+			}
+		}
+	}
 }
\ No newline at end of file
diff --git a/src/services/script_patcher/script_patcher_service.hpp b/src/services/script_patcher/script_patcher_service.hpp
index 4b29cd2a..016e0421 100644
--- a/src/services/script_patcher/script_patcher_service.hpp
+++ b/src/services/script_patcher/script_patcher_service.hpp
@@ -9,7 +9,7 @@ namespace big
 {
 	class script_patcher_service
 	{
-		std::vector<script_patch> m_script_patches;
+		std::list<script_patch> m_script_patches;
 		std::unordered_map<rage::joaat_t, std::unique_ptr<script_data>> m_script_data;
 		script_data* get_data_for_script(rage::joaat_t script);
 		bool does_script_have_patches(rage::joaat_t script);
@@ -20,6 +20,7 @@ namespace big
 		~script_patcher_service();
 
 		void add_patch(script_patch&& patch);
+		void remove_patch(std::string_view patch_name);
 		void on_script_load(rage::scrProgram* program);
 		uint8_t** get_script_bytecode(rage::joaat_t script);
 		void update_all_patches_for_script(rage::joaat_t script);