diff --git a/DS4Windows/DS4Library/DS4Device.cs b/DS4Windows/DS4Library/DS4Device.cs
index daae783..3a09e05 100644
--- a/DS4Windows/DS4Library/DS4Device.cs
+++ b/DS4Windows/DS4Library/DS4Device.cs
@@ -407,13 +407,18 @@ namespace DS4Windows
         private Thread timeoutCheckThread = null;
         private bool timeoutExecuted = false;
         private bool timeoutEvent = false;
+        private bool runCalib;
+        public bool ShouldRunCalib()
+        {
+            return runCalib;
+        }
 
         public DS4Device(HidDevice hidDevice)
         {
             hDevice = hidDevice;
             conType = HidConnectionType(hDevice);
             Mac = hDevice.readSerial();
-            bool runCalib = true;
+            runCalib = true;
             if (conType == ConnectionType.USB || conType == ConnectionType.SONYWA)
             {
                 inputReport = new byte[64];
diff --git a/DS4Windows/DS4Library/DS4Devices.cs b/DS4Windows/DS4Library/DS4Devices.cs
index ada6904..f570dce 100644
--- a/DS4Windows/DS4Library/DS4Devices.cs
+++ b/DS4Windows/DS4Library/DS4Devices.cs
@@ -234,7 +234,8 @@ namespace DS4Windows
                             deviceSerials.Add(serial);
                         }
 
-                        device.refreshCalibration();
+                        if (device.ShouldRunCalib())
+                            device.refreshCalibration();
                     }
                 }
             }