diff --git a/feature/node/src/main/kotlin/org/meshtastic/feature/node/component/NodeItem.kt b/feature/node/src/main/kotlin/org/meshtastic/feature/node/component/NodeItem.kt
index 551153aa4..43e052b18 100644
--- a/feature/node/src/main/kotlin/org/meshtastic/feature/node/component/NodeItem.kt
+++ b/feature/node/src/main/kotlin/org/meshtastic/feature/node/component/NodeItem.kt
@@ -153,11 +153,13 @@ fun NodeItem(
                 horizontalArrangement = Arrangement.SpaceBetween,
                 verticalAlignment = Alignment.CenterVertically,
             ) {
-                MaterialBatteryInfo(
-                    level = thatNode.batteryLevel,
-                    voltage = thatNode.voltage,
-                    contentColor = contentColor,
-                )
+                if (thatNode.batteryLevel > 0 || thatNode.voltage > 0f) {
+                    MaterialBatteryInfo(
+                        level = thatNode.batteryLevel,
+                        voltage = thatNode.voltage,
+                        contentColor = contentColor,
+                    )
+                }
                 Row(
                     horizontalArrangement = Arrangement.spacedBy(8.dp),
                     verticalAlignment = Alignment.CenterVertically,