diff --git a/source/scripts/init/defaults/system_defaults_arm b/source/scripts/init/defaults/system_defaults_arm
index 3495a2b1..b7397cbc 100755
--- a/source/scripts/init/defaults/system_defaults_arm
+++ b/source/scripts/init/defaults/system_defaults_arm
@@ -1520,3 +1520,6 @@ $MemorySwapStatsIntervalMinutes=30
 $MemorySwapTunablesSwappiness=200
 $MemorySwapTunablesWatermarkScaleFactor=80
 $MemorySwapTunablesPageCluster=0
+
+#Edns Packet Size
+$edns_packet_size=1232
diff --git a/source/scripts/init/defaults/system_defaults_bci b/source/scripts/init/defaults/system_defaults_bci
index a0a0c94e..9ef09e18 100755
--- a/source/scripts/init/defaults/system_defaults_bci
+++ b/source/scripts/init/defaults/system_defaults_bci
@@ -1369,3 +1369,6 @@ $MemorySwapStatsIntervalMinutes=30
 $MemorySwapTunablesSwappiness=200
 $MemorySwapTunablesWatermarkScaleFactor=80
 $MemorySwapTunablesPageCluster=0
+
+#Edns Packet Size
+$edns_packet_size=1232
diff --git a/source/scripts/init/defaults/system_defaults_xd4 b/source/scripts/init/defaults/system_defaults_xd4
index 4a40609f..a7fa777d 100755
--- a/source/scripts/init/defaults/system_defaults_xd4
+++ b/source/scripts/init/defaults/system_defaults_xd4
@@ -1445,3 +1445,6 @@ $FwDwld_AvlMem_RsrvThreshold=20
 
 #FwDwld_ImageProcMemPercent Default value
 $FwDwld_ImageProcMemPercent=0
+
+#Edns Packet Size
+$edns_packet_size=1232
diff --git a/source/scripts/init/service.d/service_dhcp_server.sh b/source/scripts/init/service.d/service_dhcp_server.sh
index 0d824885..eee30d4f 100755
--- a/source/scripts/init/service.d/service_dhcp_server.sh
+++ b/source/scripts/init/service.d/service_dhcp_server.sh
@@ -139,7 +139,14 @@ dnsmasq_server_start ()
                         fi
                 fi
          else
-                $SERVER -P 4096 -C $DHCP_CONF $DNS_ADDITIONAL_OPTION  #--enable-dbus
+                PARTNER_ID=$(syscfg get PartnerID)
+                EDNS_PACKET_SIZE=$(syscfg get edns_packet_size)
+                EDNS_PACKET_SIZE=${EDNS_PACKET_SIZE:-1232}
+                if [ "$PARTNER_ID" != "comcast" ]; then
+                    $SERVER -P $EDNS_PACKET_SIZE -C $DHCP_CONF $DNS_ADDITIONAL_OPTION  #--enable-dbus
+                else
+                    $SERVER -P 4096 -C $DHCP_CONF $DNS_ADDITIONAL_OPTION  #--enable-dbus
+                fi
          fi
 
 }