diff --git a/plugins/hal-assistant-google/src/se/hal/plugin/assistant/google/SmartHomeImpl.java b/plugins/hal-assistant-google/src/se/hal/plugin/assistant/google/SmartHomeImpl.java
index fb042e2a..c03c883f 100644
--- a/plugins/hal-assistant-google/src/se/hal/plugin/assistant/google/SmartHomeImpl.java
+++ b/plugins/hal-assistant-google/src/se/hal/plugin/assistant/google/SmartHomeImpl.java
@@ -200,7 +200,7 @@ public class SmartHomeImpl extends SmartHomeApp implements TokenRegistrationList
                     DeviceTrait[] traits = DeviceTraitFactory.getTraits(device);
                     Map<String, Object> deviceState = new HashMap<>();
 
-                    if (traits != null) {
+                    if (traits.length > 0) {
                         for (DeviceTrait trait : traits) {
                             deviceState.putAll(trait.generateQueryResponse(device.getDeviceData()));
                         }