diff --git a/src/Ryujinx.Input/HLE/NpadManager.cs b/src/Ryujinx.Input/HLE/NpadManager.cs
index 2409ecf22c..1bc54d6946 100644
--- a/src/Ryujinx.Input/HLE/NpadManager.cs
+++ b/src/Ryujinx.Input/HLE/NpadManager.cs
@@ -176,7 +176,7 @@ namespace Ryujinx.Input.HLE
             {
                 foreach (InputConfig inputConfig in _inputConfig)
                 {
-                    _controllers[(int)inputConfig.PlayerIndex].GamepadDriver.Clear();
+                    _controllers[(int)inputConfig.PlayerIndex].GamepadDriver?.Clear();
                 }
 
                 _blockInputUpdates = false;
diff --git a/src/Ryujinx.Input/IGamepadDriver.cs b/src/Ryujinx.Input/IGamepadDriver.cs
index ff4d36993c..625c3e6941 100644
--- a/src/Ryujinx.Input/IGamepadDriver.cs
+++ b/src/Ryujinx.Input/IGamepadDriver.cs
@@ -35,7 +35,7 @@ namespace Ryujinx.Input
         IGamepad GetGamepad(string id);
 
         /// <summary>
-        /// Flush the internal state of the driver.
+        /// Clear the internal state of the driver.
         /// </summary>
         /// <remarks>Does nothing by default.</remarks>
         void Clear() { }