diff --git a/src/Components/Modules/StartupMessages.cpp b/src/Components/Modules/StartupMessages.cpp
index 55733f9a..b7be14b3 100644
--- a/src/Components/Modules/StartupMessages.cpp
+++ b/src/Components/Modules/StartupMessages.cpp
@@ -23,16 +23,22 @@ namespace Components
 				StartupMessages::TotalMessages = StartupMessages::MessageList.size();
 			}
 
-			std::string message = StartupMessages::MessageList.front();
-			StartupMessages::MessageList.pop_front();
+			const auto& message = StartupMessages::MessageList.front();
 
 			Game::Dvar_SetStringByName("ui_startupMessage", message.data());
 			Game::Dvar_SetStringByName("ui_startupMessageTitle", Utils::String::VA("Messages (%d/%d)", StartupMessages::TotalMessages - StartupMessages::MessageList.size(), StartupMessages::TotalMessages));
 			Game::Dvar_SetStringByName("ui_startupNextButtonText", StartupMessages::MessageList.size() ? "Next" : "Close");
 			Game::Cbuf_AddText(0, "openmenu startup_messages");
+
+			StartupMessages::MessageList.pop_front();
 		});
 	}
 
+	StartupMessages::~StartupMessages()
+	{
+		StartupMessages::MessageList.clear();
+	}
+
 	void StartupMessages::AddMessage(const std::string& message)
 	{
 		StartupMessages::MessageList.push_back(message);
diff --git a/src/Components/Modules/StartupMessages.hpp b/src/Components/Modules/StartupMessages.hpp
index 7680c77a..6ecf3cbe 100644
--- a/src/Components/Modules/StartupMessages.hpp
+++ b/src/Components/Modules/StartupMessages.hpp
@@ -6,6 +6,7 @@ namespace Components
 	{
 	public:
 		StartupMessages();
+		~StartupMessages();
 
 		static void AddMessage(const std::string& message);