diff --git a/DS4Windows/DS4Library/DS4Device.cs b/DS4Windows/DS4Library/DS4Device.cs
index e567a18..14da045 100644
--- a/DS4Windows/DS4Library/DS4Device.cs
+++ b/DS4Windows/DS4Library/DS4Device.cs
@@ -915,7 +915,7 @@ namespace DS4Windows
                     }
                 }
 
-                if (oldCharging != charging && conType == ConnectionType.BT)
+                if (conType == ConnectionType.BT && oldCharging != charging)
                 {
                     if (Global.getQuickCharge() && charging)
                     {