diff --git a/assets/javascripts/discourse/components/wizard-mapper-selector.js.es6 b/assets/javascripts/discourse/components/wizard-mapper-selector.js.es6
index 52b7253c..8def3e6e 100644
--- a/assets/javascripts/discourse/components/wizard-mapper-selector.js.es6
+++ b/assets/javascripts/discourse/components/wizard-mapper-selector.js.es6
@@ -37,7 +37,7 @@ export default Component.extend({
   showTypes: false,
   
   didInsertElement() {
-    if (this.activeType && !this[`${this.activeType}Enabled`]) {
+    if (!this.activeType || (this.activeType && !this[`${this.activeType}Enabled`])) {
       later(() => this.resetActiveType());
     }
     
@@ -69,7 +69,7 @@ export default Component.extend({
   },
   
   typeLabel(type) {
-    return I18n.t(`admin.wizard.selector.label.${snakeCase(type)}`)
+    return type ? I18n.t(`admin.wizard.selector.label.${snakeCase(type)}`) : null;
   },
   
   @observes('inputType')