diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py
index 1fede8f01e..bc359de4f1 100644
--- a/bitbake/lib/bb/data_smart.py
+++ b/bitbake/lib/bb/data_smart.py
@@ -406,6 +406,8 @@ class DataSmart(MutableMapping):
             for key in d:
                 if key == "_data":
                     continue
+                if not d[key]:
+                    continue
                 klist.add(key)
 
             if "_data" in d: