diff --git a/addons/wardrobe/XEH_preInit.sqf b/addons/wardrobe/XEH_preInit.sqf
index 22bd9de0b9d..efb54eea6b3 100644
--- a/addons/wardrobe/XEH_preInit.sqf
+++ b/addons/wardrobe/XEH_preInit.sqf
@@ -8,7 +8,7 @@ PREP_RECOMPILE_END;
 
 #include "initSettings.inc.sqf"
 
-missionNamespace setVariable [QGVAR(inProgress), false];
+GVAR(inProgress) = false;
 
 // Cache Wardrobe Replace Exceptions
 private _map = createHashMap;
diff --git a/addons/wardrobe/functions/fnc_replace.sqf b/addons/wardrobe/functions/fnc_replace.sqf
index 9e4859c651c..758766c353e 100644
--- a/addons/wardrobe/functions/fnc_replace.sqf
+++ b/addons/wardrobe/functions/fnc_replace.sqf
@@ -37,6 +37,7 @@ private _replaceCode = switch (_typeNumber) do {
     case TYPE_UNIFORM:  { _equipmentType = "UNIFORM";  LINKFUNC(replaceContainer) };
     case TYPE_VEST:     { _equipmentType = "VEST";     LINKFUNC(replaceContainer) };
     case TYPE_BACKPACK: { _equipmentType = "BACKPACK"; LINKFUNC(replaceContainer) };
+    case TYPE_HMD:      { _equipmentType = "NVG";      LINKFUNC(replaceOther) };
     default {
         // CfgGlasses items do not have a ItemInfo subclass and therefore, not typeNumber
         switch (true) do {
diff --git a/addons/wardrobe/functions/fnc_replaceOther.sqf b/addons/wardrobe/functions/fnc_replaceOther.sqf
index 7f88c7689af..99b3f4cc211 100644
--- a/addons/wardrobe/functions/fnc_replaceOther.sqf
+++ b/addons/wardrobe/functions/fnc_replaceOther.sqf
@@ -29,6 +29,9 @@ switch (_equipmentType) do {
         removeGoggles _player;
         _player addGoggles _classTarget;
     };
+    case "NVG": {
+        _player linkItem _classTarget;
+    };
 };
 
 GVAR(inProgress) = false; // re-enable action