diff --git a/js/automation-editor/trigger/mqtt.js b/js/automation-editor/trigger/mqtt.js
index ba50998ac2..dd90a70688 100644
--- a/js/automation-editor/trigger/mqtt.js
+++ b/js/automation-editor/trigger/mqtt.js
@@ -32,6 +32,5 @@ export default class MQTTTrigger extends Component {
 }
 
 MQTTTrigger.defaultConfig = {
-  topic: '',
-  payload: '',
+  topic: ''
 };
diff --git a/js/automation-editor/trigger/numeric_state.js b/js/automation-editor/trigger/numeric_state.js
index 0f212f53ca..47659fe1d7 100644
--- a/js/automation-editor/trigger/numeric_state.js
+++ b/js/automation-editor/trigger/numeric_state.js
@@ -45,7 +45,4 @@ export default class NumericStateTrigger extends Component {
 
 NumericStateTrigger.defaultConfig = {
   entity_id: '',
-  above: '',
-  below: '',
-  value_template: '',
 };
diff --git a/js/automation-editor/trigger/state.js b/js/automation-editor/trigger/state.js
index 32ae9a3c46..7ecab7e981 100644
--- a/js/automation-editor/trigger/state.js
+++ b/js/automation-editor/trigger/state.js
@@ -42,6 +42,4 @@ export default class StateTrigger extends Component {
 
 StateTrigger.defaultConfig = {
   entity_id: '',
-  from: '',
-  to: '',
 };
diff --git a/js/common/component/condition/numeric_state.js b/js/common/component/condition/numeric_state.js
index 0597d62c4b..406b0166f4 100644
--- a/js/common/component/condition/numeric_state.js
+++ b/js/common/component/condition/numeric_state.js
@@ -45,7 +45,4 @@ export default class NumericStateCondition extends Component {
 
 NumericStateCondition.defaultConfig = {
   entity_id: '',
-  above: '',
-  below: '',
-  value_template: '',
 };
diff --git a/js/common/component/condition/time.js b/js/common/component/condition/time.js
index 1e8bc3355e..4201e9a920 100644
--- a/js/common/component/condition/time.js
+++ b/js/common/component/condition/time.js
@@ -2,7 +2,7 @@ import { h, Component } from 'preact';
 
 import { onChangeEvent } from '../../util/event';
 
-export default class StateCondition extends Component {
+export default class TimeCondition extends Component {
   constructor() {
     super();
 
@@ -31,7 +31,5 @@ export default class StateCondition extends Component {
   }
 }
 
-StateCondition.defaultConfig = {
-  after: '',
-  before: '',
+TimeCondition.defaultConfig = {
 };