diff --git a/data/translations/de/LC_MESSAGES/gopher64.po b/data/translations/de/LC_MESSAGES/gopher64.po
index 2c44ecae..ee303205 100644
--- a/data/translations/de/LC_MESSAGES/gopher64.po
+++ b/data/translations/de/LC_MESSAGES/gopher64.po
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gopher64\n"
-"POT-Creation-Date: 2026-06-13 07:48+0000\n"
+"POT-Creation-Date: 2026-06-16 10:35+0000\n"
 "PO-Revision-Date: 2026-05-11 12:00+0000\n"
 "Last-Translator: \n"
 "Language-Team: German\n"
@@ -240,7 +240,7 @@ msgctxt "NetplayCreate"
 msgid "Create Session"
 msgstr "Sitzung erstellen"
 
-#: src/ui/gui/netplay_create.slint:105
+#: src/ui/gui/netplay_create.slint:107
 msgctxt "NetplayCreate"
 msgid "Cancel"
 msgstr "Abbrechen"
@@ -393,11 +393,11 @@ msgstr "Nachricht senden"
 #: src/ui/gui/netplay_wait.slint:94
 msgctxt "NetplayWait"
 msgid ""
-"Setting the input delay too low will cause the game to lag.\n"
+"Setting the input delay too low will cause frequent rollbacks.\n"
 "You can lower the input delay in-game by pressing Alt+[ and raise it with "
 "Alt+]."
 msgstr ""
-"Eine zu niedrige Eingabeverzögerung führt zu Ruckeln im Spiel.\n"
+"Eine zu niedrige Eingabeverzögerung führt zu häufigen Rollbacks.\n"
 "Sie können die Eingabeverzögerung im Spiel mit Alt+[ verringern und mit "
 "Alt+] erhöhen."
 
@@ -406,22 +406,22 @@ msgctxt "NetplayWait"
 msgid "Local Input Delay:"
 msgstr "Lokale Eingabeverzögerung:"
 
-#: src/ui/gui/netplay_wait.slint:117
+#: src/ui/gui/netplay_wait.slint:118
 msgctxt "NetplayWait"
 msgid "Recommended: "
 msgstr "Empfohlen: "
 
-#: src/ui/gui/netplay_wait.slint:126
+#: src/ui/gui/netplay_wait.slint:127
 msgctxt "NetplayWait"
 msgid "Start Game"
 msgstr "Spiel starten"
 
-#: src/ui/gui/netplay_wait.slint:126
+#: src/ui/gui/netplay_wait.slint:127
 msgctxt "NetplayWait"
 msgid "Waiting for P2P mesh "
 msgstr "Warten auf P2P-Mesh "
 
-#: src/ui/gui/netplay_wait.slint:134
+#: src/ui/gui/netplay_wait.slint:135
 msgctxt "NetplayWait"
 msgid "Cancel"
 msgstr "Abbrechen"
diff --git a/data/translations/es/LC_MESSAGES/gopher64.po b/data/translations/es/LC_MESSAGES/gopher64.po
index 39bdfc0d..88f284f6 100644
--- a/data/translations/es/LC_MESSAGES/gopher64.po
+++ b/data/translations/es/LC_MESSAGES/gopher64.po
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gopher64\n"
-"POT-Creation-Date: 2026-06-13 07:48+0000\n"
+"POT-Creation-Date: 2026-06-16 10:35+0000\n"
 "PO-Revision-Date: 2026-05-11 12:00+0000\n"
 "Last-Translator: Gemini\n"
 "Language-Team: Spanish (Spain)\n"
@@ -240,7 +240,7 @@ msgctxt "NetplayCreate"
 msgid "Create Session"
 msgstr "Crear sesión"
 
-#: src/ui/gui/netplay_create.slint:105
+#: src/ui/gui/netplay_create.slint:107
 msgctxt "NetplayCreate"
 msgid "Cancel"
 msgstr "Cancelar"
@@ -393,36 +393,36 @@ msgstr "Enviar mensaje"
 #: src/ui/gui/netplay_wait.slint:94
 msgctxt "NetplayWait"
 msgid ""
-"Setting the input delay too low will cause the game to lag.\n"
+"Setting the input delay too low will cause frequent rollbacks.\n"
 "You can lower the input delay in-game by pressing Alt+[ and raise it with "
 "Alt+]."
 msgstr ""
-"Configurar un retardo de entrada demasiado bajo hará que el juego se "
-"ralentice.\n"
-"Puedes reducir el retardo de entrada en el juego pulsando Alt+[ y "
-"aumentarlo con Alt+]."
+"Configurar un retardo de entrada demasiado bajo provocará rollbacks "
+"frecuentes.\n"
+"Puedes reducir el retardo de entrada en el juego pulsando Alt+[ y aumentarlo "
+"con Alt+]."
 
 #: src/ui/gui/netplay_wait.slint:101
 msgctxt "NetplayWait"
 msgid "Local Input Delay:"
 msgstr "Retardo de entrada local:"
 
-#: src/ui/gui/netplay_wait.slint:117
+#: src/ui/gui/netplay_wait.slint:118
 msgctxt "NetplayWait"
 msgid "Recommended: "
 msgstr "Recomendado: "
 
-#: src/ui/gui/netplay_wait.slint:126
+#: src/ui/gui/netplay_wait.slint:127
 msgctxt "NetplayWait"
 msgid "Start Game"
 msgstr "Iniciar juego"
 
-#: src/ui/gui/netplay_wait.slint:126
+#: src/ui/gui/netplay_wait.slint:127
 msgctxt "NetplayWait"
 msgid "Waiting for P2P mesh "
 msgstr "Esperando malla P2P "
 
-#: src/ui/gui/netplay_wait.slint:134
+#: src/ui/gui/netplay_wait.slint:135
 msgctxt "NetplayWait"
 msgid "Cancel"
 msgstr "Cancelar"
diff --git a/data/translations/fr/LC_MESSAGES/gopher64.po b/data/translations/fr/LC_MESSAGES/gopher64.po
index 191b08e0..bbf56257 100644
--- a/data/translations/fr/LC_MESSAGES/gopher64.po
+++ b/data/translations/fr/LC_MESSAGES/gopher64.po
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gopher64\n"
-"POT-Creation-Date: 2026-06-13 07:48+0000\n"
+"POT-Creation-Date: 2026-06-16 10:35+0000\n"
 "PO-Revision-Date: 2026-05-11 12:00+0000\n"
 "Last-Translator: \n"
 "Language-Team: French (France)\n"
@@ -240,7 +240,7 @@ msgctxt "NetplayCreate"
 msgid "Create Session"
 msgstr "Créer la session"
 
-#: src/ui/gui/netplay_create.slint:105
+#: src/ui/gui/netplay_create.slint:107
 msgctxt "NetplayCreate"
 msgid "Cancel"
 msgstr "Annuler"
@@ -394,35 +394,35 @@ msgstr "Envoyer"
 #: src/ui/gui/netplay_wait.slint:94
 msgctxt "NetplayWait"
 msgid ""
-"Setting the input delay too low will cause the game to lag.\n"
+"Setting the input delay too low will cause frequent rollbacks.\n"
 "You can lower the input delay in-game by pressing Alt+[ and raise it with "
 "Alt+]."
 msgstr ""
-"Régler le délai d'entrée trop bas provoquera des ralentissements.\n"
-"Vous pouvez diminuer le délai d'entrée en jeu avec Alt+[ et l'augmenter "
-"avec Alt+]."
+"Régler le délai d'entrée trop bas provoquera des rollbacks fréquents.\n"
+"Vous pouvez diminuer le délai d'entrée en jeu avec Alt+[ et l'augmenter avec "
+"Alt+]."
 
 #: src/ui/gui/netplay_wait.slint:101
 msgctxt "NetplayWait"
 msgid "Local Input Delay:"
 msgstr "Délai d'entrée local :"
 
-#: src/ui/gui/netplay_wait.slint:117
+#: src/ui/gui/netplay_wait.slint:118
 msgctxt "NetplayWait"
 msgid "Recommended: "
 msgstr "Recommandé : "
 
-#: src/ui/gui/netplay_wait.slint:126
+#: src/ui/gui/netplay_wait.slint:127
 msgctxt "NetplayWait"
 msgid "Start Game"
 msgstr "Lancer la partie"
 
-#: src/ui/gui/netplay_wait.slint:126
+#: src/ui/gui/netplay_wait.slint:127
 msgctxt "NetplayWait"
 msgid "Waiting for P2P mesh "
 msgstr "En attente du maillage P2P "
 
-#: src/ui/gui/netplay_wait.slint:134
+#: src/ui/gui/netplay_wait.slint:135
 msgctxt "NetplayWait"
 msgid "Cancel"
 msgstr "Annuler"
diff --git a/data/translations/gopher64.pot b/data/translations/gopher64.pot
index bc0d732c..0774bc4d 100644
--- a/data/translations/gopher64.pot
+++ b/data/translations/gopher64.pot
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2026-06-13 07:48+0000\n"
+"POT-Creation-Date: 2026-06-16 10:37+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -238,7 +238,7 @@ msgctxt "NetplayCreate"
 msgid "Create Session"
 msgstr ""
 
-#: src/ui/gui/netplay_create.slint:105
+#: src/ui/gui/netplay_create.slint:107
 msgctxt "NetplayCreate"
 msgid "Cancel"
 msgstr ""
@@ -391,8 +391,8 @@ msgstr ""
 #: src/ui/gui/netplay_wait.slint:94
 msgctxt "NetplayWait"
 msgid ""
-"Setting the input delay too low will cause the game to lag.\nYou can lower "
-"the input delay in-game by pressing Alt+[ and raise it with Alt+]."
+"Setting the input delay too low will cause frequent rollbacks.\nYou can "
+"lower the input delay in-game by pressing Alt+[ and raise it with Alt+]."
 msgstr ""
 
 #: src/ui/gui/netplay_wait.slint:101
@@ -400,22 +400,22 @@ msgctxt "NetplayWait"
 msgid "Local Input Delay:"
 msgstr ""
 
-#: src/ui/gui/netplay_wait.slint:117
+#: src/ui/gui/netplay_wait.slint:118
 msgctxt "NetplayWait"
 msgid "Recommended: "
 msgstr ""
 
-#: src/ui/gui/netplay_wait.slint:126
+#: src/ui/gui/netplay_wait.slint:127
 msgctxt "NetplayWait"
 msgid "Start Game"
 msgstr ""
 
-#: src/ui/gui/netplay_wait.slint:126
+#: src/ui/gui/netplay_wait.slint:127
 msgctxt "NetplayWait"
 msgid "Waiting for P2P mesh "
 msgstr ""
 
-#: src/ui/gui/netplay_wait.slint:134
+#: src/ui/gui/netplay_wait.slint:135
 msgctxt "NetplayWait"
 msgid "Cancel"
 msgstr ""
diff --git a/data/translations/ja/LC_MESSAGES/gopher64.po b/data/translations/ja/LC_MESSAGES/gopher64.po
index 8c08f38b..d3af8e0e 100644
--- a/data/translations/ja/LC_MESSAGES/gopher64.po
+++ b/data/translations/ja/LC_MESSAGES/gopher64.po
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gopher64\n"
-"POT-Creation-Date: 2026-06-13 07:48+0000\n"
+"POT-Creation-Date: 2026-06-16 10:35+0000\n"
 "PO-Revision-Date: 2026-05-11 12:00+0000\n"
 "Last-Translator: \n"
 "Language-Team: Japanese\n"
@@ -238,7 +238,7 @@ msgctxt "NetplayCreate"
 msgid "Create Session"
 msgstr "セッションを作成"
 
-#: src/ui/gui/netplay_create.slint:105
+#: src/ui/gui/netplay_create.slint:107
 msgctxt "NetplayCreate"
 msgid "Cancel"
 msgstr "キャンセル"
@@ -391,11 +391,11 @@ msgstr "送信"
 #: src/ui/gui/netplay_wait.slint:94
 msgctxt "NetplayWait"
 msgid ""
-"Setting the input delay too low will cause the game to lag.\n"
+"Setting the input delay too low will cause frequent rollbacks.\n"
 "You can lower the input delay in-game by pressing Alt+[ and raise it with "
 "Alt+]."
 msgstr ""
-"入力遅延を低く設定しすぎるとゲームが遅延します。\n"
+"入力遅延を低く設定しすぎると頻繁にロールバックが発生します。\n"
 "Alt+[ でゲーム内の入力遅延を下げ、Alt+] で上げることができます。"
 
 #: src/ui/gui/netplay_wait.slint:101
@@ -403,22 +403,22 @@ msgctxt "NetplayWait"
 msgid "Local Input Delay:"
 msgstr "ローカル入力遅延:"
 
-#: src/ui/gui/netplay_wait.slint:117
+#: src/ui/gui/netplay_wait.slint:118
 msgctxt "NetplayWait"
 msgid "Recommended: "
 msgstr "推奨: "
 
-#: src/ui/gui/netplay_wait.slint:126
+#: src/ui/gui/netplay_wait.slint:127
 msgctxt "NetplayWait"
 msgid "Start Game"
 msgstr "ゲーム開始"
 
-#: src/ui/gui/netplay_wait.slint:126
+#: src/ui/gui/netplay_wait.slint:127
 msgctxt "NetplayWait"
 msgid "Waiting for P2P mesh "
 msgstr "P2Pメッシュ接続待機中 "
 
-#: src/ui/gui/netplay_wait.slint:134
+#: src/ui/gui/netplay_wait.slint:135
 msgctxt "NetplayWait"
 msgid "Cancel"
 msgstr "キャンセル"
diff --git a/data/translations/nl/LC_MESSAGES/gopher64.po b/data/translations/nl/LC_MESSAGES/gopher64.po
index 22b8e372..05569462 100644
--- a/data/translations/nl/LC_MESSAGES/gopher64.po
+++ b/data/translations/nl/LC_MESSAGES/gopher64.po
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gopher64\n"
-"POT-Creation-Date: 2026-06-13 07:48+0000\n"
+"POT-Creation-Date: 2026-06-16 10:35+0000\n"
 "PO-Revision-Date: 2026-05-11 12:00+0000\n"
 "Last-Translator: \n"
 "Language-Team: Dutch (Netherlands)\n"
@@ -240,7 +240,7 @@ msgctxt "NetplayCreate"
 msgid "Create Session"
 msgstr "Sessie aanmaken"
 
-#: src/ui/gui/netplay_create.slint:105
+#: src/ui/gui/netplay_create.slint:107
 msgctxt "NetplayCreate"
 msgid "Cancel"
 msgstr "Annuleren"
@@ -393,11 +393,11 @@ msgstr "Bericht verzenden"
 #: src/ui/gui/netplay_wait.slint:94
 msgctxt "NetplayWait"
 msgid ""
-"Setting the input delay too low will cause the game to lag.\n"
+"Setting the input delay too low will cause frequent rollbacks.\n"
 "You can lower the input delay in-game by pressing Alt+[ and raise it with "
 "Alt+]."
 msgstr ""
-"Een te lage invoervertraging zorgt ervoor dat het spel gaat haperen.\n"
+"Een te lage invoervertraging zorgt voor frequente rollbacks.\n"
 "Je kunt de invoervertraging in het spel verlagen met Alt+[ en verhogen met "
 "Alt+]."
 
@@ -406,22 +406,22 @@ msgctxt "NetplayWait"
 msgid "Local Input Delay:"
 msgstr "Lokale invoervertraging:"
 
-#: src/ui/gui/netplay_wait.slint:117
+#: src/ui/gui/netplay_wait.slint:118
 msgctxt "NetplayWait"
 msgid "Recommended: "
 msgstr "Aanbevolen: "
 
-#: src/ui/gui/netplay_wait.slint:126
+#: src/ui/gui/netplay_wait.slint:127
 msgctxt "NetplayWait"
 msgid "Start Game"
 msgstr "Spel starten"
 
-#: src/ui/gui/netplay_wait.slint:126
+#: src/ui/gui/netplay_wait.slint:127
 msgctxt "NetplayWait"
 msgid "Waiting for P2P mesh "
 msgstr "Wachten op P2P-mesh "
 
-#: src/ui/gui/netplay_wait.slint:134
+#: src/ui/gui/netplay_wait.slint:135
 msgctxt "NetplayWait"
 msgid "Cancel"
 msgstr "Annuleren"
diff --git a/data/translations/pt_BR/LC_MESSAGES/gopher64.po b/data/translations/pt_BR/LC_MESSAGES/gopher64.po
index 2cf25220..16d76bb9 100644
--- a/data/translations/pt_BR/LC_MESSAGES/gopher64.po
+++ b/data/translations/pt_BR/LC_MESSAGES/gopher64.po
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2026-06-13 07:48+0000\n"
+"POT-Creation-Date: 2026-06-16 10:35+0000\n"
 "PO-Revision-Date: 2026-05-11 18:11-3000\n"
 "Last-Translator: EDUARDO CARVALHO <eduardotcarvalho@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -240,7 +240,7 @@ msgctxt "NetplayCreate"
 msgid "Create Session"
 msgstr "Criar Sessão"
 
-#: src/ui/gui/netplay_create.slint:105
+#: src/ui/gui/netplay_create.slint:107
 msgctxt "NetplayCreate"
 msgid "Cancel"
 msgstr "Cancelar"
@@ -394,35 +394,35 @@ msgstr "Enviar Mensagem"
 #: src/ui/gui/netplay_wait.slint:94
 msgctxt "NetplayWait"
 msgid ""
-"Setting the input delay too low will cause the game to lag.\n"
+"Setting the input delay too low will cause frequent rollbacks.\n"
 "You can lower the input delay in-game by pressing Alt+[ and raise it with "
 "Alt+]."
 msgstr ""
-"Definir o atraso de entrada muito baixo causará lag no jogo.\n"
-"Você pode diminuir o atraso de entrada no jogo pressionando Alt+[ e "
-"aumentá-lo com Alt+]."
+"Definir o atraso de entrada muito baixo causará rollbacks frequentes.\n"
+"Você pode diminuir o atraso de entrada no jogo pressionando Alt+[ e aumentá-"
+"lo com Alt+]."
 
 #: src/ui/gui/netplay_wait.slint:101
 msgctxt "NetplayWait"
 msgid "Local Input Delay:"
 msgstr "Atraso de entrada local:"
 
-#: src/ui/gui/netplay_wait.slint:117
+#: src/ui/gui/netplay_wait.slint:118
 msgctxt "NetplayWait"
 msgid "Recommended: "
 msgstr "Recomendado: "
 
-#: src/ui/gui/netplay_wait.slint:126
+#: src/ui/gui/netplay_wait.slint:127
 msgctxt "NetplayWait"
 msgid "Start Game"
 msgstr "Iniciar jogo"
 
-#: src/ui/gui/netplay_wait.slint:126
+#: src/ui/gui/netplay_wait.slint:127
 msgctxt "NetplayWait"
 msgid "Waiting for P2P mesh "
 msgstr "Aguardando malha P2P "
 
-#: src/ui/gui/netplay_wait.slint:134
+#: src/ui/gui/netplay_wait.slint:135
 msgctxt "NetplayWait"
 msgid "Cancel"
 msgstr "Cancelar"
diff --git a/data/translations/ru/LC_MESSAGES/gopher64.po b/data/translations/ru/LC_MESSAGES/gopher64.po
index 37aa7475..b5c996b3 100644
--- a/data/translations/ru/LC_MESSAGES/gopher64.po
+++ b/data/translations/ru/LC_MESSAGES/gopher64.po
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gopher64\n"
-"POT-Creation-Date: 2026-06-13 07:48+0000\n"
+"POT-Creation-Date: 2026-06-16 10:35+0000\n"
 "PO-Revision-Date: 2026-05-11 12:00+0000\n"
 "Last-Translator: \n"
 "Language-Team: Russian\n"
@@ -239,7 +239,7 @@ msgctxt "NetplayCreate"
 msgid "Create Session"
 msgstr "Создать сессию"
 
-#: src/ui/gui/netplay_create.slint:105
+#: src/ui/gui/netplay_create.slint:107
 msgctxt "NetplayCreate"
 msgid "Cancel"
 msgstr "Отмена"
@@ -392,11 +392,11 @@ msgstr "Отправить сообщение"
 #: src/ui/gui/netplay_wait.slint:94
 msgctxt "NetplayWait"
 msgid ""
-"Setting the input delay too low will cause the game to lag.\n"
+"Setting the input delay too low will cause frequent rollbacks.\n"
 "You can lower the input delay in-game by pressing Alt+[ and raise it with "
 "Alt+]."
 msgstr ""
-"Слишком низкая задержка ввода вызовет лаги в игре.\n"
+"Слишком низкая задержка ввода приведёт к частым откатам.\n"
 "Вы можете уменьшить задержку ввода в игре, нажав Alt+[, и увеличить её с "
 "помощью Alt+]."
 
@@ -405,22 +405,22 @@ msgctxt "NetplayWait"
 msgid "Local Input Delay:"
 msgstr "Локальная задержка ввода:"
 
-#: src/ui/gui/netplay_wait.slint:117
+#: src/ui/gui/netplay_wait.slint:118
 msgctxt "NetplayWait"
 msgid "Recommended: "
 msgstr "Рекомендуется: "
 
-#: src/ui/gui/netplay_wait.slint:126
+#: src/ui/gui/netplay_wait.slint:127
 msgctxt "NetplayWait"
 msgid "Start Game"
 msgstr "Начать игру"
 
-#: src/ui/gui/netplay_wait.slint:126
+#: src/ui/gui/netplay_wait.slint:127
 msgctxt "NetplayWait"
 msgid "Waiting for P2P mesh "
 msgstr "Ожидание P2P-сети "
 
-#: src/ui/gui/netplay_wait.slint:134
+#: src/ui/gui/netplay_wait.slint:135
 msgctxt "NetplayWait"
 msgid "Cancel"
 msgstr "Отмена"
diff --git a/src/netplay.rs b/src/netplay.rs
index f379ae94..977b8f4b 100644
--- a/src/netplay.rs
+++ b/src/netplay.rs
@@ -438,7 +438,7 @@ pub fn init(
         .with_fps(if pal { 50 } else { 60 })
         .unwrap()
         .with_desync_detection_mode(ggrs::DesyncDetection::On { interval: 60 })
-        .with_max_prediction_window(0)
+        .with_max_prediction_window(16)
         .with_disconnect_timeout(std::time::Duration::from_secs(if cfg!(debug_assertions) {
             10
         } else {
diff --git a/src/ui/gui/netplay_wait.slint b/src/ui/gui/netplay_wait.slint
index 73b1c6bd..db2e1551 100644
--- a/src/ui/gui/netplay_wait.slint
+++ b/src/ui/gui/netplay_wait.slint
@@ -91,7 +91,7 @@ export component NetplayWait inherits Page {
                 }
 
                 Text {
-                    text: NetplayData.player_name == NetplayWaitData.players[0] ? @tr("Setting the input delay too low will cause the game to lag.\nYou can lower the input delay in-game by pressing Alt+[ and raise it with Alt+].") : NetplayWaitData.motd;
+                    text: NetplayData.player_name == NetplayWaitData.players[0] ? @tr("Setting the input delay too low will cause frequent rollbacks.\nYou can lower the input delay in-game by pressing Alt+[ and raise it with Alt+].") : NetplayWaitData.motd;
                     horizontal-alignment: center;
                     wrap: word-wrap;
                 }
@@ -105,7 +105,7 @@ export component NetplayWait inherits Page {
 
                     SpinBox {
                         minimum: 0;
-                        maximum: 32;
+                        maximum: 16;
                         value: NetplayWaitData.input_delay;
                         enabled: NetplayWaitData.recommended_delay != 0;
                         edited => {
diff --git a/src/ui/netplay.rs b/src/ui/netplay.rs
index 92cc6049..9aab4290 100644
--- a/src/ui/netplay.rs
+++ b/src/ui/netplay.rs
@@ -666,7 +666,7 @@ fn update_ping(
                                             };
                                             let latency_frames = (ping_avg / (1000.0 / refresh_rate)).ceil() as i32;
                                             let recommendation =
-                                                (latency_frames + 1).min(32);
+                                                (latency_frames + 1).min(16);
 
                                             if handle.get_netplay_recommended_delay() == 0 {
                                                 handle.set_netplay_input_delay(recommendation);