diff --git a/CMakeLists.txt b/CMakeLists.txt
index a73ec9d6..ddf101a4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -150,7 +150,7 @@ set(OBSW_ADD_SCEX_DEVICE
     ${INIT_VAL}
     CACHE STRING "Add Solar Cell Experiment module")
 set(OBSW_SYRLINKS_SIMULATED
-    ${INIT_VAL}
+    ${OBSW_Q7S_EM}
     CACHE STRING "Syrlinks is simulated")
 
 # ##############################################################################
diff --git a/bsp_q7s/OBSWConfig.h.in b/bsp_q7s/OBSWConfig.h.in
index 76dce7b5..840e2575 100644
--- a/bsp_q7s/OBSWConfig.h.in
+++ b/bsp_q7s/OBSWConfig.h.in
@@ -60,7 +60,7 @@
 /*******************************************************************/
 
 // Can be used to switch device to NORMAL mode immediately
-#define OBSW_SWITCH_TO_NORMAL_MODE_AFTER_STARTUP    1
+#define OBSW_SWITCH_TO_NORMAL_MODE_AFTER_STARTUP    0
 #define OBSW_PRINT_MISSED_DEADLINES                 1
 
 #define OBSW_MPSOC_JTAG_BOOT                        0