diff --git a/src/main/java/io/github/dsheirer/source/tuner/rtl/RTL2832TunerController.java b/src/main/java/io/github/dsheirer/source/tuner/rtl/RTL2832TunerController.java
index de09ff7b..8c7f78a8 100644
--- a/src/main/java/io/github/dsheirer/source/tuner/rtl/RTL2832TunerController.java
+++ b/src/main/java/io/github/dsheirer/source/tuner/rtl/RTL2832TunerController.java
@@ -579,7 +579,12 @@ public class RTL2832TunerController extends USBTunerController
     {
         short address = 1;
         int value = (enabled ? 0x18 : 0x10);
-        writeDemodRegister(Page.ONE, address, value, 1);
+
+        boolean isEnabledAlready = isI2CRepeaterEnabled();
+        if (isEnabledAlready != enabled) {
+           // mLog.info("trying to " + (enabled ? "enable" : "disable") + " i2c repeater, which is currently " + (isEnabledAlready ? "enabled" : "disabled"));
+            writeDemodRegister(Page.ONE, address, value, 1);
+        }
     }
 
     /**