diff --git a/app/Input/InputDispatcher.cs b/app/Input/InputDispatcher.cs
index 9980108b..fffa3e22 100644
--- a/app/Input/InputDispatcher.cs
+++ b/app/Input/InputDispatcher.cs
@@ -86,9 +86,14 @@ namespace GHelper.Input
             Program.acpi.DeviceInit();
 
             if (!OptimizationService.IsRunning())
+            {
+                Program.acpi.DeviceGet(AsusACPI.CameraShutter);
                 listener = new KeyboardListener(HandleEvent);
+            }
             else
+            {
                 Logger.WriteLine("Optimization service is running");
+            }
 
             InitBacklightTimer();
 
diff --git a/app/Peripherals/Mouse/AsusMouse.cs b/app/Peripherals/Mouse/AsusMouse.cs
index 79cc0736..107ce494 100644
--- a/app/Peripherals/Mouse/AsusMouse.cs
+++ b/app/Peripherals/Mouse/AsusMouse.cs
@@ -481,9 +481,8 @@ namespace GHelper.Peripherals.Mouse
         {
             try
             {
-                HidSharp.DeviceList.Local.GetHidDevices(VendorID(), ProductID())
-                    .First(x => x.DevicePath.Contains(path));
-                return true;
+                return HidSharp.DeviceList.Local.GetHidDevices(VendorID(), ProductID())
+                    .FirstOrDefault(x => x.DevicePath.Contains(path)) != null;
             }
             catch
             {