diff --git a/src/conditionValve/ConditionValve.py b/src/conditionValve/ConditionValve.py
index db5605c57788649ec811146b371013e50a1962cb..a1f96512512a656297887bf09d0edb8e00057cf0 100644
--- a/src/conditionValve/ConditionValve.py
+++ b/src/conditionValve/ConditionValve.py
@@ -11,7 +11,7 @@ from karabo.middlelayer import (
     DaqPolicy, Device, DeviceNode, isSet, Overwrite, Slot, State, String,
     VectorHash, waitUntilNew)
 
-BASE_STATES = [State.UNKNOWN, State.NORMAL, State.INIT,
+BASE_STATES = [State.UNKNOWN, State.NORMAL, State.INIT, State.INTERLOCK_BROKEN,
                State.ERROR, State.INTERLOCKED, State.DISABLED]
 
 
@@ -26,7 +26,7 @@ class envRow(Configurable):
 
     condition = String(
         displayedName="State Condition",
-        defaultValue="UNKNOWN",
+        defaultValue="ON",
         options=[state.name for state in condStates],
         daqPolicy=DaqPolicy.OMIT)