diff --git a/core/serialize.cpp b/core/serialize.cpp
index 34e5be1a6..e633baaee 100644
--- a/core/serialize.cpp
+++ b/core/serialize.cpp
@@ -573,31 +573,32 @@ static bool dc_unserialize_libretro(void **data, unsigned int *total_size)
 	REICAST_US(SB_FFST_rc);
 	REICAST_US(SB_FFST);
 
-	if (settings.platform.system == DC_PLATFORM_NAOMI)
+	if (settings.platform.system == DC_PLATFORM_NAOMI || settings.platform.system == DC_PLATFORM_ATOMISWAVE)
 	{
 		REICAST_US(sys_nvmem->size);
 		REICAST_US(sys_nvmem->mask);
 		REICAST_USA(sys_nvmem->data, sys_nvmem->size);
 	}
-	else if (settings.platform.system == DC_PLATFORM_ATOMISWAVE)
-	{
-		REICAST_US(sys_rom->size);
-		REICAST_US(sys_rom->mask);
-		REICAST_USA(sys_rom->data, sys_rom->size);
-	}
 	else
 	{
 		REICAST_US(i);
 		REICAST_US(i);
 	}
 
-	if (settings.platform.system != DC_PLATFORM_NAOMI)
+	if (settings.platform.system == DC_PLATFORM_DREAMCAST)
 	{
 		REICAST_US(sys_nvmem->size);
 		REICAST_US(sys_nvmem->mask);
 		REICAST_US(static_cast<DCFlashChip*>(sys_nvmem)->state);
 		REICAST_USA(sys_nvmem->data, sys_nvmem->size);
 	}
+	else if (settings.platform.system == DC_PLATFORM_ATOMISWAVE)
+	{
+		REICAST_US(sys_rom->size);
+		REICAST_US(sys_rom->mask);
+		REICAST_US(static_cast<DCFlashChip*>(sys_rom)->state);
+		REICAST_USA(sys_rom->data, sys_rom->size);
+	}
 	else
 	{
 		REICAST_US(i);