diff --git a/CMakeLists.txt b/CMakeLists.txt
index a671429b..b35aaa15 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,9 +86,9 @@ set(OBSW_ADD_TMTC_TCP_SERVER
     1
     CACHE STRING "Add TCP TMTC Server")
 set(OBSW_ADD_TMTC_UDP_SERVER
-    # TODO: Activate UDP server until VC0 issue has been resolved
+    # TODO: Activate UDP server on FM until VC0 issue has been resolved
     # 0
-    1
+    ${INIT_VAL}
     CACHE STRING "Add UDP TMTC Server")
 set(OBSW_ADD_MGT
     ${INIT_VAL}