diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/DexcomPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/DexcomPlugin.kt
index 7049589bbd..4b14ef5160 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/DexcomPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/DexcomPlugin.kt
@@ -30,6 +30,7 @@ import info.nightscout.shared.logging.LTag
 import info.nightscout.shared.sharedPreferences.SP
 import javax.inject.Inject
 import javax.inject.Singleton
+import kotlin.math.abs
 
 @Singleton
 class DexcomPlugin @Inject constructor(
@@ -143,6 +144,18 @@ class DexcomPlugin @Inject constructor(
                             sourceSensor = sourceSensor
                         )
                 }
+                // G6 calibration bug workaround (2 additional GVs are created within 1 second from previous record)
+                if (sourceSensor == GlucoseValue.SourceSensor.DEXCOM_G6_NATIVE) {
+                    glucoseValues.sortBy { it.timestamp }
+                    for (i in glucoseValues.indices) {
+                        if (i < glucoseValues.size - 1) {
+                            if (abs(glucoseValues[i].timestamp - glucoseValues[i + 1].timestamp) < 1000) {
+                                aapsLogger.debug(LTag.DATABASE, "Excluding bg ${glucoseValues[i + 1]}")
+                                glucoseValues.removeAt(i + 1)
+                            }
+                        }
+                    }
+                }
                 val sensorStartTime = if (sp.getBoolean(R.string.key_dexcom_lognssensorchange, false) && bundle.containsKey("sensorInsertionTime")) {
                     bundle.getLong("sensorInsertionTime", 0) * 1000
                 } else {