diff --git a/conf/distro/include/rdk-filogic.inc b/conf/distro/include/rdk-filogic.inc
index 2757e79..e982ce5 100644
--- a/conf/distro/include/rdk-filogic.inc
+++ b/conf/distro/include/rdk-filogic.inc
@@ -20,7 +20,7 @@
 DISTRO_FEATURES_append = " core-net-lib"
 
 # RDKB-48800: Install DHCP Manager service file
-DISTRO_FEATURES_append_broadband = " dhcp_manager"
+#DISTRO_FEATURES_append_broadband = " dhcp_manager"
 
 # Fix MeshAgent build errors
 DISTRO_FEATURES_append_broadband = " WanFailOverSupportEnable"
diff --git a/recipes-ccsp/ccsp/ccsp-dhcp-mgr.bbappend b/recipes-ccsp/ccsp/ccsp-dhcp-mgr.bbappend
index 1bdf76b..5bf31da 100644
--- a/recipes-ccsp/ccsp/ccsp-dhcp-mgr.bbappend
+++ b/recipes-ccsp/ccsp/ccsp-dhcp-mgr.bbappend
@@ -1,4 +1,10 @@
 require ccsp_common_filogic.inc
 
 EXTRA_OECONF_append_dunfell  = " --with-ccsp-arch=arm"
-CFLAGS_append_kirkstone = " -fcommon "
\ No newline at end of file
+CFLAGS_append_kirkstone = " -fcommon "
+
+do_install_append() {
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'dhcp_manager', 'false', 'true', d)}; then
+        rm -rf ${D}${systemd_unitdir}/
+    fi
+}
\ No newline at end of file