diff --git a/rpcs3/Emu/Io/PadHandler.cpp b/rpcs3/Emu/Io/PadHandler.cpp
index 6e4754370d..fe9a12a49b 100644
--- a/rpcs3/Emu/Io/PadHandler.cpp
+++ b/rpcs3/Emu/Io/PadHandler.cpp
@@ -225,7 +225,7 @@ PadHandlerBase::connection PadHandlerBase::get_next_button_press(const std::stri
 	if (get_blacklist)
 		blacklist.clear();
 
-	if (first_call)
+	if (first_call || get_blacklist)
 		min_button_values.clear();
 
 	auto device = get_device(pad_id);
diff --git a/rpcs3/Input/evdev_joystick_handler.cpp b/rpcs3/Input/evdev_joystick_handler.cpp
index 4de4cdb3f8..fea5d73ca4 100644
--- a/rpcs3/Input/evdev_joystick_handler.cpp
+++ b/rpcs3/Input/evdev_joystick_handler.cpp
@@ -302,7 +302,7 @@ PadHandlerBase::connection evdev_joystick_handler::get_next_button_press(const s
 	if (get_blacklist)
 		m_blacklist.clear();
 
-	if (first_call)
+	if (first_call || get_blacklist)
 		m_min_button_values.clear();
 
 	// Get our evdev device
diff --git a/rpcs3/Input/mm_joystick_handler.cpp b/rpcs3/Input/mm_joystick_handler.cpp
index 2a1616e7ec..38b5d2fe50 100644
--- a/rpcs3/Input/mm_joystick_handler.cpp
+++ b/rpcs3/Input/mm_joystick_handler.cpp
@@ -226,7 +226,7 @@ PadHandlerBase::connection mm_joystick_handler::get_next_button_press(const std:
 	if (get_blacklist)
 		m_blacklist.clear();
 
-	if (first_call)
+	if (first_call || get_blacklist)
 		m_min_button_values.clear();
 
 	if (!Init())