diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.Joypad.cs b/BizHawk.Client.Common/lua/EmuLuaLibrary.Joypad.cs
index 0d5f73b523..401f29d264 100644
--- a/BizHawk.Client.Common/lua/EmuLuaLibrary.Joypad.cs
+++ b/BizHawk.Client.Common/lua/EmuLuaLibrary.Joypad.cs
@@ -121,7 +121,8 @@ namespace BizHawk.Client.Common
 						}
 						else
 						{
-							Global.ForceOffAdaptor.SetSticky(button.ToString(), false);
+							Global.StickyXORAdapter.Unset(button.ToString());
+							Global.ForceOffAdaptor.Unset(button.ToString());
 						}
 					}
 					else // Inverse
diff --git a/BizHawk.Client.Common/movie/InputAdapters.cs b/BizHawk.Client.Common/movie/InputAdapters.cs
index 1259f9a315..7ba9620c7f 100644
--- a/BizHawk.Client.Common/movie/InputAdapters.cs
+++ b/BizHawk.Client.Common/movie/InputAdapters.cs
@@ -244,6 +244,11 @@ namespace BizHawk.Client.Common
 				this.StickySet.Remove(button);
 			}
 		}
+
+		public void Unset(string button)
+		{
+			StickySet.Remove(button);
+		}
 	}
 
 	public class StickyXorAdapter : IController
@@ -315,6 +320,11 @@ namespace BizHawk.Client.Common
 			}
 		}
 
+		public void Unset(string button)
+		{
+			stickySet.Remove(button);
+		}
+
 		public bool IsSticky(string button)
 		{
 			return stickySet.Contains(button);