diff --git a/src/client/game/scripting/lua/event_handler.cpp b/src/client/game/scripting/lua/event_handler.cpp
index 7121ea63..ef8597ce 100644
--- a/src/client/game/scripting/lua/event_handler.cpp
+++ b/src/client/game/scripting/lua/event_handler.cpp
@@ -81,9 +81,9 @@ namespace scripting::lua
 	{
 		auto merger = [&](task_list& tasks)
 		{
-			for(auto& task : tasks)
+			for (auto& task : tasks)
 			{
-				if(task.id == handle.id)
+				if (task.id == handle.id)
 				{
 					task.endon_conditions.emplace_back(entity, event);
 				}
diff --git a/src/client/game/scripting/lua/event_handler.hpp b/src/client/game/scripting/lua/event_handler.hpp
index fc95b704..e12dcab6 100644
--- a/src/client/game/scripting/lua/event_handler.hpp
+++ b/src/client/game/scripting/lua/event_handler.hpp
@@ -43,7 +43,7 @@ namespace scripting::lua
 		sol::state& state_;
 		std::atomic_int64_t current_listener_id_ = 0;
 
-		using task_list = std::vector<event_listener>;
+		using task_list = std::list<event_listener>;
 		utils::concurrency::container<task_list> new_callbacks_;
 		utils::concurrency::container<task_list, std::recursive_mutex> callbacks_;