diff --git a/app/Settings.cs b/app/Settings.cs
index f8b46904..5b86241a 100644
--- a/app/Settings.cs
+++ b/app/Settings.cs
@@ -1136,8 +1136,16 @@ namespace GHelper
 
                 if (m.IsDeviceReady)
                 {
-                    b.Text = m.GetDisplayName() + "\n" + m.Battery + "%"
-                    + (m.Charging ? "(" + Properties.Strings.Charging + ")" : "");
+                    if (m.HasBattery())
+                    {
+                        b.Text = m.GetDisplayName() + "\n" + m.Battery + "%"
+                                            + (m.Charging ? "(" + Properties.Strings.Charging + ")" : "");
+                    }
+                    else
+                    {
+                        b.Text = m.GetDisplayName();
+                    }
+
                 }
                 else
                 {