diff --git a/src/client/component/dvars.cpp b/src/client/component/dvars.cpp
index 1e74871d..ece4ed70 100644
--- a/src/client/component/dvars.cpp
+++ b/src/client/component/dvars.cpp
@@ -2,13 +2,12 @@
 #include "loader/component_loader.hpp"
 
 #include "game/game.hpp"
+#include "scheduler.hpp"
 
 #include <utils/hook.hpp>
 #include <utils/io.hpp>
 #include <utils/string.hpp>
 
-#include "scheduler.hpp"
-
 namespace dvars
 {
 	namespace
@@ -114,12 +113,6 @@ namespace dvars
 			{
 				return false;
 			}
-
-			//TODO: Fix archive dvars not stripping names from registered dvars
-			if (dvar->debugName == "cg_unlockall_loot"s || dvar->debugName == "cg_unlockall_purchases"s || dvar->debugName == "cg_unlockall_attachments"s || dvar->debugName == "cg_unlockall_camos"s)
-			{
-				return true;
-			}
 			
 			return (dvar->flags & game::DVAR_ARCHIVE);
 		}
@@ -217,6 +210,8 @@ namespace dvars
 			utils::hook::nop(game::select(0x142152227, 0x140509797), 6);
 			// Show all dvars in dvardump command
 			utils::hook::nop(game::select(0x142151BF9, 0x140509179), 6);
+			// Stops game from deleting debug names from archive dvars
+			utils::hook::set<uint8_t>(game::select(0x1422C5DE0, 0x1405786D0), 0xC3);
 		}
 	};
 }