diff --git a/src/app/icd/BUILD.gn b/src/app/icd/BUILD.gn
index d8f9fadbb238fe..63157175f12e7b 100644
--- a/src/app/icd/BUILD.gn
+++ b/src/app/icd/BUILD.gn
@@ -31,7 +31,7 @@ source_set("manager-srcs") {
 # ICD Server Configuration
 # All configurations necessary to the ICD Server featureset need to in this configuration
 config("server-config") {
-  defines = [ "CHIP_CONFIG_ICD_SERVER_ENABLE" ]
+  defines = [ "CHIP_CONFIG_ENABLE_ICD_SERVER" ]
 }
 
 # servers-srcs source-set contains all the sources and configurations necessary to build the ICD Server functionality
diff --git a/src/app/server/Server.cpp b/src/app/server/Server.cpp
index abce3942597da7..2bcba57c2ae3a9 100644
--- a/src/app/server/Server.cpp
+++ b/src/app/server/Server.cpp
@@ -247,9 +247,9 @@ CHIP_ERROR Server::Init(const ServerInitParams & initParams)
     }
 #endif // CHIP_CONFIG_ENABLE_SERVER_IM_EVENT
 
-#ifdef CHIP_CONFIG_ICD_SERVER_ENABLE
+#ifdef CHIP_CONFIG_ENABLE_ICD_SERVER
     mICDEventManager.Init(&mICDManager);
-#endif // CHIP_CONFIG_ICD_SERVER_ENABLE
+#endif // CHIP_CONFIG_ENABLE_ICD_SERVER
 
     // This initializes clusters, so should come after lower level initialization.
     InitDataModelHandler();
@@ -488,9 +488,9 @@ void Server::Shutdown()
     mAccessControl.Finish();
     Access::ResetAccessControlToDefault();
     Credentials::SetGroupDataProvider(nullptr);
-#ifdef CHIP_CONFIG_ICD_SERVER_ENABLE
+#ifdef CHIP_CONFIG_ENABLE_ICD_SERVER
     mICDEventManager.Shutdown();
-#endif // CHIP_CONFIG_ICD_SERVER_ENABLE
+#endif // CHIP_CONFIG_ENABLE_ICD_SERVER
     mAttributePersister.Shutdown();
     // TODO(16969): Remove chip::Platform::MemoryInit() call from Server class, it belongs to outer code
     chip::Platform::MemoryShutdown();
diff --git a/src/app/server/Server.h b/src/app/server/Server.h
index 0efa55879f1e21..bf5220edd036c3 100644
--- a/src/app/server/Server.h
+++ b/src/app/server/Server.h
@@ -65,10 +65,10 @@
 #endif
 #include <transport/raw/UDP.h>
 
-#ifdef CHIP_CONFIG_ICD_SERVER_ENABLE
+#ifdef CHIP_CONFIG_ENABLE_ICD_SERVER
 #include <app/icd/ICDEventManager.h>
 #include <app/icd/ICDManager.h>
-#endif // CHIP_CONFIG_ICD_SERVER_ENABLE
+#endif // CHIP_CONFIG_ENABLE_ICD_SERVER
 
 namespace chip {
 
@@ -600,10 +600,10 @@ class Server
     Inet::InterfaceId mInterfaceId;
 
     System::Clock::Microseconds64 mInitTimestamp;
-#ifdef CHIP_CONFIG_ICD_SERVER_ENABLE
+#ifdef CHIP_CONFIG_ENABLE_ICD_SERVER
     app::ICDEventManager mICDEventManager;
     app::ICDManager mICDManager;
-#endif // CHIP_CONFIG_ICD_SERVER_ENABLE
+#endif // CHIP_CONFIG_ENABLE_ICD_SERVER
 };
 
 } // namespace chip