diff --git a/config.def.h b/config.def.h
index 6c70b6e946..5adb889f2d 100644
--- a/config.def.h
+++ b/config.def.h
@@ -756,7 +756,7 @@ static const bool input_descriptor_hide_unbound = false;
 
 static const unsigned input_max_users = 5;
 
-static const unsigned input_poll_type_behavior = 1;
+static const unsigned input_poll_type_behavior = 2;
 
 #ifdef IOS
 static const bool ui_companion_start_on_boot = false;
diff --git a/configuration.c b/configuration.c
index 6703528735..897546153c 100644
--- a/configuration.c
+++ b/configuration.c
@@ -484,7 +484,7 @@ static void config_set_defaults(void)
 #endif
    settings->input.keyboard_gamepad_enable          = true;
    settings->input.keyboard_gamepad_mapping_type    = 1;
-   settings->input.poll_type_behavior               = 1;
+   settings->input.poll_type_behavior               = 2;
 #ifdef HAVE_FFMPEG
    settings->multimedia.builtin_mediaplayer_enable  = true;
 #else