diff --git a/CMakeLists.txt b/CMakeLists.txt
index f6fbfb48a66c3f4f97250a98994b33e2d6eb1254..1806c16d120c366260a8cb6e4fd9caad5da3e761 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,6 +11,7 @@ option(CHAOS_ARCHITECTURE_TEST "Architecture tests" OFF)
 option(CHAOS_CDS "Chaos Data Service" ON)
 option(CHAOS_MDS "Chaos MetaData Service" ON)
 option(CHAOS_WAN "Chaos Wan Service" ON)
+option(CHAOS_AGENT "Chaos Agent Service" ON)
 option(CHAOS_DATA_EXPORT "Chaos Data Export" ON)
 option(CHAOS_EXAMPLES "Chaos Examples" ON)
 option(CHAOS_CCS "Chaos CCS Compile needs qt5.6-static-x86_64 installed" OFF)
@@ -58,8 +59,10 @@ ADD_SUBDIRECTORY(chaos/cu_toolkit)
 MESG("Configure UIToolkit Layer")
 ADD_SUBDIRECTORY(chaos/ui_toolkit)
 
-MESG("Configure Chaos Agent")
+IF (CHAOS_AGENT)
+MESG("Configure Chaos Agent Service")
 ADD_SUBDIRECTORY(ChaosAgent)
+ENDIF()
 
 IF (CHAOS_MDS)
   MESG("Configure Chaos Metadata Service")