diff --git a/Core/MemMapFunctions.cpp b/Core/MemMapFunctions.cpp
index 1f9b17bef..ee2370c0d 100644
--- a/Core/MemMapFunctions.cpp
+++ b/Core/MemMapFunctions.cpp
@@ -83,7 +83,11 @@ inline void ReadFromHardware(T &var, const u32 address)
 	}
 	else
 	{
-		WARN_LOG(MEMMAP, "ReadFromHardware: Invalid address %08x PC %08x LR %08x", address, currentMIPS->pc, currentMIPS->r[MIPS_REG_RA]);
+		if (g_Config.iCpuCore == CPU_JIT) {
+			WARN_LOG(MEMMAP, "ReadFromHardware: Invalid address %08x", address);
+		} else {
+			WARN_LOG(MEMMAP, "ReadFromHardware: Invalid address %08x PC %08x LR %08x", address, currentMIPS->pc, currentMIPS->r[MIPS_REG_RA]);
+		}
 		if (!g_Config.bIgnoreBadMemAccess) {
 			Core_EnableStepping(true);
 			host->SetDebugMode(true);
@@ -111,7 +115,11 @@ inline void WriteToHardware(u32 address, const T data)
 	}
 	else
 	{
-		WARN_LOG(MEMMAP, "WriteToHardware: Invalid address %08x	PC %08x LR %08x", address, currentMIPS->pc, currentMIPS->r[MIPS_REG_RA]);
+		if (g_Config.iCpuCore == CPU_JIT) {
+			WARN_LOG(MEMMAP, "WriteToHardware: Invalid address %08x", address);
+		} else {
+			WARN_LOG(MEMMAP, "WriteToHardware: Invalid address %08x	PC %08x LR %08x", address, currentMIPS->pc, currentMIPS->r[MIPS_REG_RA]);
+		}
 		if (!g_Config.bIgnoreBadMemAccess) {
 			Core_EnableStepping(true);
 			host->SetDebugMode(true);