diff --git a/src/BizHawk.Client.Common/controllers/AutofireController.cs b/src/BizHawk.Client.Common/controllers/AutofireController.cs
index 1f3c425007..58af852252 100644
--- a/src/BizHawk.Client.Common/controllers/AutofireController.cs
+++ b/src/BizHawk.Client.Common/controllers/AutofireController.cs
@@ -41,11 +41,7 @@ namespace BizHawk.Client.Common
 			_buttonStarts.Clear();
 		}
 
-		/// <exception cref="NotImplementedException">always</exception>
-		public int AxisValue(string name)
-		{
-			throw new NotImplementedException();
-		}
+		public int AxisValue(string name) => Definition.Axes[name].Neutral;
 
 		public IReadOnlyCollection<(string Name, int Strength)> GetHapticsSnapshot() => Array.Empty<(string, int)>();
 
diff --git a/src/BizHawk.Client.Common/inputAdapters/BitwiseAdapters.cs b/src/BizHawk.Client.Common/inputAdapters/BitwiseAdapters.cs
index 4a420b74c8..e4d628aa70 100644
--- a/src/BizHawk.Client.Common/inputAdapters/BitwiseAdapters.cs
+++ b/src/BizHawk.Client.Common/inputAdapters/BitwiseAdapters.cs
@@ -18,9 +18,11 @@ namespace BizHawk.Client.Common
 			return false;
 		}
 
-		// pass axes solely from the original source
-		// this works in the code because SourceOr is the autofire controller
-		public int AxisValue(string name) => Source.AxisValue(name);
+		public int AxisValue(string name)
+		{
+			int neutralValue = Source.Definition.Axes[name].Neutral;
+			return SourceAnd.AxisValue(name) != neutralValue ? Source.AxisValue(name) : neutralValue;
+		}
 
 		public IReadOnlyCollection<(string Name, int Strength)> GetHapticsSnapshot() => Source.GetHapticsSnapshot();
 
@@ -77,9 +79,11 @@ namespace BizHawk.Client.Common
 					| (SourceOr?.IsPressed(button) ?? false);
 		}
 
-		// pass axes solely from the original source
-		// this works in the code because SourceOr is the autofire controller
-		public int AxisValue(string name) => Source.AxisValue(name);
+		public int AxisValue(string name)
+		{
+			int sourceValue = Source.AxisValue(name);
+			return sourceValue != Source.Definition.Axes[name].Neutral ? sourceValue : SourceOr.AxisValue(name);
+		}
 
 		public IReadOnlyCollection<(string Name, int Strength)> GetHapticsSnapshot() => Source.GetHapticsSnapshot();