diff --git a/gso/oss-params-example.json b/gso/oss-params-example.json
index 95ad8c021835e62c43107c193da8b2b135ee95b2..63de6f892954672074a3327987572626ed724c16 100644
--- a/gso/oss-params-example.json
+++ b/gso/oss-params-example.json
@@ -125,6 +125,7 @@
     "DSN": "https://sentry-dsn-url"
   },
   "MOODI": {
-    "host": "moodi.test.gap.geant.org"
+    "host": "moodi.test.gap.geant.org",
+    "moodi_enabled": false
   }
 }
diff --git a/gso/utils/workflow_steps.py b/gso/utils/workflow_steps.py
index 3ce208a8de33ca92c255351099999e7af9bf625b..01a64e586676f4c6e37da0eee03aecd967dcf652 100644
--- a/gso/utils/workflow_steps.py
+++ b/gso/utils/workflow_steps.py
@@ -7,7 +7,7 @@ from orchestrator import inputstep, step
 from orchestrator.config.assignee import Assignee
 from orchestrator.types import State, UUIDstr
 from orchestrator.utils.json import json_dumps
-from orchestrator.workflow import StepList, begin, conditional
+from orchestrator.workflow import StepList, conditional
 from pydantic import ConfigDict
 from pydantic_forms.core import FormPage
 from pydantic_forms.types import FormGenerator
@@ -407,7 +407,7 @@ def start_moodi() -> StepList:
             "extra_vars": {"subscription": subscription},
         }
 
-    return begin >> _is_moodi_enabled(begin >> lso_interaction(_start_moodi))
+    return _is_moodi_enabled(lso_interaction(_start_moodi))
 
 
 def stop_moodi() -> StepList:
@@ -422,4 +422,4 @@ def stop_moodi() -> StepList:
             "extra_vars": None,
         }
 
-    return begin >> _is_moodi_enabled(begin >> lso_interaction(_stop_moodi))
+    return _is_moodi_enabled(lso_interaction(_stop_moodi))