diff --git a/assets/javascripts/discourse/lib/wizard.js.es6 b/assets/javascripts/discourse/lib/wizard.js.es6
index 32408ce6..668ebe6a 100644
--- a/assets/javascripts/discourse/lib/wizard.js.es6
+++ b/assets/javascripts/discourse/lib/wizard.js.es6
@@ -61,7 +61,7 @@ function listProperties(type, opts={}) {
       Object.keys(types).forEach(type => {
         typeProperties = typeProperties.concat(Object.keys(types[type]));
       });
-    } else if (opts.objectType) {
+    } else if (opts.objectType && types[opts.objectType]) {
       typeProperties = Object.keys(types[opts.objectType]);
     }