diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BroadcastGlucose.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BroadcastGlucose.java
index 3c3cc73957..b9fb7b7e4d 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BroadcastGlucose.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BroadcastGlucose.java
@@ -63,7 +63,7 @@ public static void sendLocalBroadcast(final BgReading bgReading) {
                 UserError.Log.i("SENSOR QUEUE:", "Broadcast data");
 
                 String collectorName = DexCollectionType.getBestCollectorHardwareName();
-                if (collectorName.equals("G6 Native")) {
+                if (collectorName.equals("G6 Native") || collectorName.equals("G7")) {
                     collectorName += " / G5 Native"; // compatibility for older AAPS
                 }
                 bundle.putString(Intents.XDRIP_DATA_SOURCE_DESCRIPTION, collectorName);
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/DexCollectionType.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/DexCollectionType.java
index e26e38fafd..dad8ca4b81 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/DexCollectionType.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/DexCollectionType.java
@@ -13,6 +13,7 @@
 import com.eveningoutpost.dexdrip.cgm.sharefollow.ShareFollowService;
 import com.eveningoutpost.dexdrip.cgm.webfollow.WebFollowService;
 import com.eveningoutpost.dexdrip.cgm.carelinkfollow.CareLinkFollowService;
+import static com.eveningoutpost.dexdrip.services.Ob1G5CollectionService.getTransmitterID;
 
 import java.lang.reflect.Method;
 import java.util.Collections;
@@ -276,7 +277,7 @@ public static String getBestCollectorHardwareName() {
                 return "Network G4 and Classic xDrip";
             case DexcomG5:
                 if (Ob1G5CollectionService.usingNativeMode()) {
-                    return Ob1G5CollectionService.usingG6() ? "G6 Native" : "G5 Native";
+                    return Ob1G5CollectionService.usingG6() ? (getTransmitterID().length() < 6 ? "G7" : "G6 Native") : "G5 Native";
                 }
                 return dct.name();
             case LibreWifi: