diff --git a/BizHawk.Emulation.Common/Base Implementations/MemoryDomain.cs b/BizHawk.Emulation.Common/Base Implementations/MemoryDomain.cs index f95d29992d..7a878e702d 100644 --- a/BizHawk.Emulation.Common/Base Implementations/MemoryDomain.cs +++ b/BizHawk.Emulation.Common/Base Implementations/MemoryDomain.cs @@ -270,7 +270,14 @@ namespace BizHawk.Emulation.Common return _systemBus; } - return this.FirstOrDefault(x => x.Name == "System Bus"); + var bus = this.FirstOrDefault(x => x.Name == "System Bus"); + + if (bus != null) + { + return bus; + } + + return MainMemory; } set