diff --git a/src/Ryujinx/UI/ViewModels/Input/ControllerInputViewModel.cs b/src/Ryujinx/UI/ViewModels/Input/ControllerInputViewModel.cs
index b580ffe29..e25937082 100644
--- a/src/Ryujinx/UI/ViewModels/Input/ControllerInputViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/Input/ControllerInputViewModel.cs
@@ -25,7 +25,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         private (float, float) _uiStickRight;
 
         internal CancellationTokenSource _pollTokenSource = new();
-        private CancellationToken _pollToken;
+        private readonly CancellationToken _pollToken;
 
         private GamepadInputConfig _config;
         public GamepadInputConfig Config
@@ -152,7 +152,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                     UiStickRight = _selectedGamepad.GetStick(StickInputId.Right);
                 }
 
-                await Task.Delay(StickUiPollMs);
+                await Task.Delay(StickUiPollMs, token);
             }
 
             _pollTokenSource.Dispose();