diff --git a/runtime/starpu/control/context.c b/runtime/starpu/control/context.c
index bb8b2d38ac9f5631db28fb13d7d27a8649e3c521..0e25a6cdbfab780be19707fa03a1c68a08e62aff 100644
--- a/runtime/starpu/control/context.c
+++ b/runtime/starpu/control/context.c
@@ -38,15 +38,6 @@ void RUNTIME_context_create( MORSE_context_t *morse )
     conf = morse->schedopt;
 
     starpu_conf_init( conf );
-    conf->nopencl = 0;
-
-    /* By default, use the dmda strategy */
-    if (!getenv("STARPU_SCHED"))
-        conf->sched_policy_name = "dmda";
-
-    /* By default, enable calibration */
-    if (!getenv("STARPU_CALIBRATE"))
-        conf->calibrate = 1;
 
     return;
 }
diff --git a/runtime/starpu/control/control.c b/runtime/starpu/control/control.c
index 21a3196520d03b4ee6457c87eb56eb56fb163d3c..330817db4a58e41f3aaa307549ef3435a1ace780 100644
--- a/runtime/starpu/control/control.c
+++ b/runtime/starpu/control/control.c
@@ -46,6 +46,15 @@ int RUNTIME_init_scheduler( MORSE_context_t *morse, int nworkers, int ncudas, in
 
     conf->ncpus = nworkers;
     conf->ncuda = ncudas;
+    conf->nopencl = 0;
+
+    /* By default, use the dmdas strategy */
+    if (!getenv("STARPU_SCHED"))
+        conf->sched_policy_name = "dmdas";
+
+    /* By default, enable calibration */
+    if (!getenv("STARPU_CALIBRATE"))
+        conf->calibrate = 1;
 
     /* Set scheduling to "ws" if no cuda devices used because it behaves better
      * on homognenous architecture. If the user wants to use another