diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.kt
index 113bd10f5b..e7cec2e4e2 100644
--- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.kt
+++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.kt
@@ -218,11 +218,11 @@ open class OpenAPSSMBPlugin @Inject constructor(
             constraintChecker.isAdvancedFilteringEnabled(it)
             inputConstraints.copyReasons(it)
         }
-        val uam = ConstraintObject(false, aapsLogger).also {
+        val uam = ConstraintObject(true, aapsLogger).also {
             constraintChecker.isUAMEnabled(it)
             inputConstraints.copyReasons(it)
         }
-        dynIsfEnabled = ConstraintObject(false, aapsLogger).also {
+        dynIsfEnabled = ConstraintObject(true, aapsLogger).also {
             constraintChecker.isDynIsfModeEnabled(it)
             inputConstraints.copyReasons(it)
         }
diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective5.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective5.kt
index bed7e387a4..8e66cf7d04 100644
--- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective5.kt
+++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective5.kt
@@ -19,7 +19,7 @@ class Objective5(injector: HasAndroidInjector) : Objective(injector, "maxiobzero
         tasks.add(
             object : Task(this, R.string.closedmodeenabled) {
                 override fun isCompleted(): Boolean {
-                    val closedLoopEnabled = ConstraintObject(false, aapsLogger)
+                    val closedLoopEnabled = ConstraintObject(true, aapsLogger)
                     safetyPlugin.isClosedLoopAllowed(closedLoopEnabled)
                     return closedLoopEnabled.value()
                 }