diff --git a/Source/diablo.cpp b/Source/diablo.cpp
index 804c4d265..eef036ff8 100644
--- a/Source/diablo.cpp
+++ b/Source/diablo.cpp
@@ -176,7 +176,6 @@ void FreeGame()
 	FreeXPBar();
 	FreeControlPan();
 	FreeInvGFX();
-	FreeStashGFX();
 	FreeGMenu();
 	FreeQuestText();
 	FreeInfoBoxGfx();
@@ -2234,6 +2233,7 @@ void FreeGameMem()
 	FreeMissileGFX();
 	FreeObjectGFX();
 	FreeTownerGFX();
+	FreeStashGFX();
 #ifndef USE_SDL1
 	DeactivateVirtualGamepad();
 	FreeVirtualGamepadGFX();
@@ -2605,7 +2605,6 @@ void LoadGameLevel(bool firstflag, lvl_entry lvldir)
 		qtextflag = false;
 		if (!HeadlessMode) {
 			InitInv();
-			InitStash();
 			InitQuestText();
 			InitInfoBoxGfx();
 			InitHelp();
@@ -2731,6 +2730,7 @@ void LoadGameLevel(bool firstflag, lvl_entry lvldir)
 			}
 
 			InitTowners();
+			InitStash();
 			InitItems();
 			InitMissiles();
 			IncProgress();
diff --git a/Source/qol/stash.cpp b/Source/qol/stash.cpp
index 505c60989..c46b2efb9 100644
--- a/Source/qol/stash.cpp
+++ b/Source/qol/stash.cpp
@@ -268,8 +268,10 @@ void InitStash()
 {
 	InitialWithdrawGoldValue = 0;
 
-	StashPanelArt = LoadClx("data\\stash.clx");
-	StashNavButtonArt = LoadClx("data\\stashnavbtns.clx");
+	if (!HeadlessMode) {
+		StashPanelArt = LoadClx("data\\stash.clx");
+		StashNavButtonArt = LoadClx("data\\stashnavbtns.clx");
+	}
 }
 
 void TransferItemToInventory(Player &player, uint16_t itemId)