diff --git a/Assets/dll/uae.wbx.zst b/Assets/dll/uae.wbx.zst
index ae2699192a..d5d8a50f38 100644
Binary files a/Assets/dll/uae.wbx.zst and b/Assets/dll/uae.wbx.zst differ
diff --git a/src/BizHawk.Emulation.Cores/Computers/Amiga/LibUAE.cs b/src/BizHawk.Emulation.Cores/Computers/Amiga/LibUAE.cs
index 66d1772c0a..410c31ace6 100644
--- a/src/BizHawk.Emulation.Cores/Computers/Amiga/LibUAE.cs
+++ b/src/BizHawk.Emulation.Cores/Computers/Amiga/LibUAE.cs
@@ -90,6 +90,7 @@ namespace BizHawk.Emulation.Cores.Computers.Amiga
 
 		public enum ControllerType : int
 		{
+			None,
 			Joystick,
 			Mouse,
 			[Display(Name = "CD32 pad")]
diff --git a/src/BizHawk.Emulation.Cores/Computers/Amiga/UAE.ISettable.cs b/src/BizHawk.Emulation.Cores/Computers/Amiga/UAE.ISettable.cs
index 394b30d172..32e95c93c9 100644
--- a/src/BizHawk.Emulation.Cores/Computers/Amiga/UAE.ISettable.cs
+++ b/src/BizHawk.Emulation.Cores/Computers/Amiga/UAE.ISettable.cs
@@ -264,6 +264,9 @@ namespace BizHawk.Emulation.Cores.Computers.Amiga
 
 				switch (type)
 				{
+					case LibUAE.ControllerType.None:
+						AppendSetting($"joyport{port}=none");
+						break;
 					case LibUAE.ControllerType.Joystick:
 						AppendSetting($"joyport{port}mode=djoy");
 						break;
diff --git a/waterbox/uae/bizhawk.c b/waterbox/uae/bizhawk.c
index a884cc5b76..28a9c215cc 100644
--- a/waterbox/uae/bizhawk.c
+++ b/waterbox/uae/bizhawk.c
@@ -48,6 +48,8 @@ ECL_EXPORT void FrameAdvance(MyFrameInfo* f)
 	for (int port = 0; port <= 1; port++)
 	{
 		Controller *controller = (port == 0) ? &f->Port1 : &f->Port2;
+		if (controller->Type == CONTROLLER_NONE) continue;
+		
 		cd32_pad_enabled[port] = 0;
 		joydir[port] = 0;
 
diff --git a/waterbox/uae/bizhawk.h b/waterbox/uae/bizhawk.h
index 36bd1c494f..6ca795a08e 100644
--- a/waterbox/uae/bizhawk.h
+++ b/waterbox/uae/bizhawk.h
@@ -93,6 +93,7 @@ enum DriveAction
 
 enum ControllerType
 {
+	CONTROLLER_NONE,
 	CONTROLLER_JOYSTICK,
 	CONTROLLER_MOUSE,
 	CONTROLLER_CD32PAD