diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/g5model/Ob1DexTransmitterBattery.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/Ob1DexTransmitterBattery.java
index 07d2d464b8..59f5b33c60 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/g5model/Ob1DexTransmitterBattery.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/Ob1DexTransmitterBattery.java
@@ -1,6 +1,8 @@
 package com.eveningoutpost.dexdrip.g5model;
 
 
+import static com.eveningoutpost.dexdrip.g5model.Ob1G5StateMachine.shortTxId;
+
 import com.eveningoutpost.dexdrip.models.JoH;
 import com.eveningoutpost.dexdrip.services.G5BaseService;
 import com.eveningoutpost.dexdrip.services.Ob1G5CollectionService;
@@ -61,7 +63,7 @@ public String daysEstimate() {
 
         StringBuilder b = new StringBuilder();
 
-        if (battery.runtime > -1) {
+        if (battery.runtime > -1 && !shortTxId()) { // Excluding G7
             b.append(battery.runtime);
         }
 
@@ -93,6 +95,9 @@ public boolean voltageAWarning() {
     }
 
     public boolean voltageBWarning() {
+        if (shortTxId()) { // G7 only
+            return voltageB() < (G5BaseService.LOW_BATTERY_WARNING_LEVEL - 25);
+        }
         return voltageB() < (G5BaseService.LOW_BATTERY_WARNING_LEVEL - 10);
     };