diff --git a/src/components/ha-service-picker.html b/src/components/ha-service-picker.html
index 44488d8184..c884f8d2d3 100644
--- a/src/components/ha-service-picker.html
+++ b/src/components/ha-service-picker.html
@@ -34,6 +34,7 @@ class HaServicePicker extends Polymer.Element {
   _hassChanged(hass, oldHass) {
     if (!hass) {
       this._services = [];
+      return;
     } else if (oldHass && hass.config.services === oldHass.config.services) {
       return;
     }