diff --git a/desmume/src/MMU.cpp b/desmume/src/MMU.cpp
index 020109e2b..203ab08dc 100644
--- a/desmume/src/MMU.cpp
+++ b/desmume/src/MMU.cpp
@@ -1,7 +1,7 @@
 /*
 	Copyright (C) 2006 yopyop
 	Copyright (C) 2007 shash
-	Copyright (C) 2007-2021 DeSmuME team
+	Copyright (C) 2007-2022 DeSmuME team
 
 	This file is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -5199,7 +5199,7 @@ void FASTCALL _MMU_ARM7_write08(u32 adr, u8 val)
 				if (NDS_ARM7.instruct_adr > 0x3FFF) return;
 #ifdef HAVE_JIT
 				// hack for firmware boot in JIT mode
-				if (CommonSettings.UseExtFirmware && CommonSettings.BootFromFirmware && extFirmwareObj->loaded() && val == 1)
+				if (CommonSettings.UseExtFirmware && CommonSettings.BootFromFirmware && extFirmwareObj->isLoaded() && val == 1)
 					CommonSettings.jit_max_block_size = saveBlockSizeJIT;
 #endif
 				break;
diff --git a/desmume/src/firmware.cpp b/desmume/src/firmware.cpp
index 7d2907660..58c742ee2 100644
--- a/desmume/src/firmware.cpp
+++ b/desmume/src/firmware.cpp
@@ -1,5 +1,5 @@
 /*	
-	Copyright (C) 2009-2019 DeSmuME Team
+	Copyright (C) 2009-2022 DeSmuME Team
 
 	This file is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -531,7 +531,7 @@ std::string CFIRMWARE::GetUserSettingsFilePath(const char *firmwareFilePath)
 	return finalPath;
 }
 
-bool CFIRMWARE::loaded()
+bool CFIRMWARE::isLoaded()
 {
 	return this->_isLoaded;
 }
@@ -1319,9 +1319,12 @@ bool NDS_ReadFirmwareDataFromFile(const char *fileName, NDSFirmwareData *outFirm
 
 void fw_reset_com(fw_memory_chip *mc)
 {
-	if(mc->com == FW_CMD_PAGEWRITE)
+	if (mc->com == FW_CMD_PAGEWRITE)
 	{
-		if (mc->isFirmware && CommonSettings.UseExtFirmware && CommonSettings.UseExtFirmwareSettings && (extFirmwareObj != NULL))
+		if (mc->isFirmware &&
+		    CommonSettings.UseExtFirmware &&
+		    CommonSettings.UseExtFirmwareSettings &&
+		    (extFirmwareObj != NULL) && extFirmwareObj->isLoaded())
 		{
 			extFirmwareObj->saveSettings(CommonSettings.ExtFirmwareUserSettingsPath);
 		}
diff --git a/desmume/src/firmware.h b/desmume/src/firmware.h
index eb745ac04..305a0457f 100644
--- a/desmume/src/firmware.h
+++ b/desmume/src/firmware.h
@@ -1,5 +1,5 @@
 /*
-	Copyright (C) 2009-2019 DeSmuME Team
+	Copyright (C) 2009-2022 DeSmuME Team
 
 	This file is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -439,7 +439,7 @@ public:
 	bool loadSettings(const char *firmwareUserSettingsFilePath);
 	bool saveSettings(const char *firmwareUserSettingsFilePath);
 
-	bool loaded();
+	bool isLoaded();
 	void* getTouchCalibrate();
 	
 	static std::string GetUserSettingsFilePath(const char *firmwareFilePath);