diff --git a/Core/Disassembler.cpp b/Core/Disassembler.cpp
index d8df1c86..4e69576e 100644
--- a/Core/Disassembler.cpp
+++ b/Core/Disassembler.cpp
@@ -512,7 +512,9 @@ string Disassembler::GetCode(AddressTypeInfo &addressInfo, uint32_t endAddr, uin
 			byteCode.clear();
 			code.clear();
 			effAddress.clear();
-			info->GetEffectiveAddressString(effAddress, cpuState, memoryManager.get(), labelManager.get());
+			if(showEffectiveAddresses) {
+				info->GetEffectiveAddressString(effAddress, cpuState, memoryManager.get(), labelManager.get());
+			}
 			info->ToString(code, memoryAddr, memoryManager.get(), labelManager.get());
 			info->GetByteCode(byteCode);