diff --git a/src/devices/cpu/sparc/sparc.cpp b/src/devices/cpu/sparc/sparc.cpp
index 1d732758cf2..d9b299c79bd 100644
--- a/src/devices/cpu/sparc/sparc.cpp
+++ b/src/devices/cpu/sparc/sparc.cpp
@@ -1050,6 +1050,13 @@ void sparc_base_device::device_post_load()
 	update_gpr_pointers();
 }
 
+void mb86930_device::device_post_load()
+{
+	sparc_base_device::device_post_load();
+
+	update_addr_masks();
+}
+
 
 //-------------------------------------------------
 //  memory_space_config - return the configuration
diff --git a/src/devices/cpu/sparc/sparc.h b/src/devices/cpu/sparc/sparc.h
index 8f071a8c72b..2f7162c3fbc 100644
--- a/src/devices/cpu/sparc/sparc.h
+++ b/src/devices/cpu/sparc/sparc.h
@@ -342,8 +342,10 @@ public:
 	auto cs5_write_cb() { return m_cs_w[5].bind(); }
 
 protected:
+	// device-level overrides
 	virtual void device_start() override;
 	virtual void device_reset() override;
+	virtual void device_post_load() override;
 
 	virtual bool execute_extra_group2(uint32_t op) override;