diff --git a/src/BizHawk.Emulation.Cores/Computers/Amiga/PUAE.cs b/src/BizHawk.Emulation.Cores/Computers/Amiga/PUAE.cs
index 7ef5dae516..6c1ba0f13f 100644
--- a/src/BizHawk.Emulation.Cores/Computers/Amiga/PUAE.cs
+++ b/src/BizHawk.Emulation.Cores/Computers/Amiga/PUAE.cs
@@ -95,16 +95,20 @@ public PUAE(CoreLoadParameters<object, PUAESyncSettings> lp)
 				SkipMemoryConsistencyCheck = lp.Comm.CorePreferences.HasFlag(CoreComm.CorePreferencesFlags.WaterboxMemoryConsistencyCheck),
 			}, new Delegate[] { _ledCallback });
 
-			for (var index = 0; index < lp.Roms.Count; index++)
+			for (var index = 0; index < _syncSettings.FloppyDrives; index++)
 			{
-				var rom = lp.Roms[index];
-				_exe.AddReadonlyFile(rom.FileData, FileNames.FD + index);
-				if (index < _syncSettings.FloppyDrives)
+				if (index < lp.Roms.Count)
 				{
+					var rom = lp.Roms[index];
+					_exe.AddReadonlyFile(rom.FileData, FileNames.FD + index);
+					_drives.Add(GetFullName(rom));
 					AppendSetting($"floppy{index}={FileNames.FD}{index}");
-					AppendSetting($"floppy{index}type={(int)DriveType.DRV_35_DD}");
+					AppendSetting($"floppy{index}type={(int) DriveType.DRV_35_DD}");
 					AppendSetting("floppy_write_protect=true");
-					_drives.Add(GetFullName(rom));
+				}
+				else
+				{
+					_drives.Add("empty");
 				}
 			}