diff --git a/core/hw/maple/maple_jvs.cpp b/core/hw/maple/maple_jvs.cpp
index 59db295b9..78452bcdc 100644
--- a/core/hw/maple/maple_jvs.cpp
+++ b/core/hw/maple/maple_jvs.cpp
@@ -250,6 +250,8 @@ private:
 			u32 target = NaomiGameInputs->buttons[i].target;
 			if (target != 0)
 				cur_mapping[keyIdx] = target;
+			else if (p1_mapping[keyIdx] != 0 || p2_mapping[keyIdx] != 0)
+				cur_mapping[keyIdx] = 0;
 		}
 	}