diff --git a/app/ui/main_window.py b/app/ui/main_window.py
index a9a36b20..40aaaea6 100644
--- a/app/ui/main_window.py
+++ b/app/ui/main_window.py
@@ -366,8 +366,7 @@ def _update_device_box(frame, dev):
 		if battery_level is None:
 			battery_icon.set_sensitive(False)
 			battery_icon.set_from_icon_name(ui.get_battery_icon(-1), _STATUS_ICON_SIZE)
-			text = 'no status' if dev.protocol < 2.0 else 'waiting for status...'
-			battery_label.set_markup('<small>%s</small>' % text)
+			battery_label.set_markup('<small>no status</small>')
 			battery_label.set_sensitive(True)
 		else:
 			battery_icon.set_from_icon_name(ui.get_battery_icon(battery_level), _STATUS_ICON_SIZE)
diff --git a/app/ui/status_icon.py b/app/ui/status_icon.py
index 562bc913..e8ef1363 100644
--- a/app/ui/status_icon.py
+++ b/app/ui/status_icon.py
@@ -88,10 +88,7 @@ def update(icon, receiver, device=None):
 					p += ' <small>(inactive)</small>'
 			else:
 				if dev.status:
-					if dev.protocol < 2.0:
-						p = '<small>no status</small>'
-					else:
-						p = '<small>waiting for status...</small>'
+					p = '<small>no status</small>'
 				else:
 					p = '<small>(inactive)</small>'