diff --git a/config.def.h b/config.def.h
index ec892fd9b4..faac49113b 100644
--- a/config.def.h
+++ b/config.def.h
@@ -798,6 +798,10 @@ static const unsigned autosave_interval = 0;
  * user 1 rather than user 2. */
 static const bool netplay_client_swap_input = true;
 
+static const unsigned netplay_delay_frames = 16;
+
+static const unsigned netplay_check_frames = 30;
+
 /* On save state load, block SRAM from being overwritten.
  * This could potentially lead to buggy games. */
 static const bool block_sram_overwrite = false;
diff --git a/configuration.c b/configuration.c
index 73e3629417..3c0bb87be5 100644
--- a/configuration.c
+++ b/configuration.c
@@ -945,8 +945,8 @@ static int populate_settings_int(settings_t *settings, struct config_int_setting
    SETTING_INT("state_slot",                   (unsigned*)&settings->state_slot, false, 0 /* TODO */, false);
 #ifdef HAVE_NETWORKING
    SETTING_INT("netplay_ip_port",              &settings->netplay.port,         true, RARCH_DEFAULT_PORT, false);
-   SETTING_INT("netplay_delay_frames",         &settings->netplay.delay_frames, true, 16, false);
-   SETTING_INT("netplay_check_frames",         &settings->netplay.check_frames, true, 30, false);
+   SETTING_INT("netplay_delay_frames",         &settings->netplay.delay_frames, true, netplay_delay_frames, false);
+   SETTING_INT("netplay_check_frames",         &settings->netplay.check_frames, true, netplay_check_frames, false);
 #endif
 #ifdef HAVE_LANGEXTRA
    SETTING_INT("user_language",                &settings->user_language, true, RETRO_LANGUAGE_ENGLISH, false);
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 0bfadabefd..89951b1cf5 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -5559,7 +5559,7 @@ static bool setting_append_list(
                   &settings->netplay.delay_frames,
                   MENU_ENUM_LABEL_NETPLAY_DELAY_FRAMES,
                   MENU_ENUM_LABEL_VALUE_NETPLAY_DELAY_FRAMES,
-                  0,
+                  netplay_delay_frames,
                   &group_info,
                   &subgroup_info,
                   parent_group,
@@ -5573,7 +5573,7 @@ static bool setting_append_list(
                   &settings->netplay.check_frames,
                   MENU_ENUM_LABEL_NETPLAY_CHECK_FRAMES,
                   MENU_ENUM_LABEL_VALUE_NETPLAY_CHECK_FRAMES,
-                  0,
+                  netplay_check_frames,
                   &group_info,
                   &subgroup_info,
                   parent_group,