diff --git a/lib/Deployer.js b/lib/Deployer.js
index 1c8a63eeb..cf923fb95 100644
--- a/lib/Deployer.js
+++ b/lib/Deployer.js
@@ -267,6 +267,12 @@ class Deployer {
                         this.metadata[type],
                         typeKeyCombo[selectedType]
                     );
+                    if (!Object.keys(this.metadata[type]).length) {
+                        Util.logger.warn(
+                            `No deployable metadata found for type ${type} for selected keys`
+                        );
+                        delete this.metadata[type];
+                    }
                 }
             }
         } else {