diff --git a/Contralto/Memory/MemoryBus.cs b/Contralto/Memory/MemoryBus.cs
index e385566..5316f65 100644
--- a/Contralto/Memory/MemoryBus.cs
+++ b/Contralto/Memory/MemoryBus.cs
@@ -62,14 +62,14 @@ namespace Contralto.Memory
                     else
                     {
                         _bus.Add(addr, dev);
-
-                        if (dev is Memory)
-                        {
-                            _mainMemory = (Memory)dev;
-                        }
                     }
                 }
             }
+
+            if (dev is Memory)
+            {
+                _mainMemory = (Memory)dev;
+            }
         }
 
         public void Reset()