diff --git a/doc/guide/congestion-handling.xml b/doc/guide/congestion-handling.xml
index 38a9f649cc0b7855ab39edcb699ace0c3057b85e..832fc5d51fb832490beed9dee85be4e43eb0cf72 100644
--- a/doc/guide/congestion-handling.xml
+++ b/doc/guide/congestion-handling.xml
@@ -95,12 +95,8 @@
         disables packet queueing. When true, the server will process packets
         from the packet queue, which is filled by a separate thread. When
         false, the server will process packets directly from the socket buffers
-        in the main thread (as done in all releases prior Kea 1.5).
-<note>
-        For Kea 1.5.0-beta2, enable-queue is ENABLED by default.  This was
-        done to expose the feature to more testing. We will finalize the
-        default setting prior to releasing Kea 1.5.0.
-</note>
+        in the main thread (as done in all releases prior Kea 1.5).  It is
+        disabled by default.
         </simpara>
       </listitem>
       <listitem>
diff --git a/src/bin/dhcp4/tests/get_config_unittest.cc b/src/bin/dhcp4/tests/get_config_unittest.cc
index fdcdb2686be9235461990ad9337c17f4c91e191f..9be8afaac4dab03a21855c00fe7bb66a8e43b1ce 100644
--- a/src/bin/dhcp4/tests/get_config_unittest.cc
+++ b/src/bin/dhcp4/tests/get_config_unittest.cc
@@ -2027,7 +2027,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -2082,7 +2082,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -2163,7 +2163,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -2244,7 +2244,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -2327,7 +2327,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -2491,7 +2491,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -2656,7 +2656,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -2741,7 +2741,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -2825,7 +2825,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -2910,7 +2910,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -2993,7 +2993,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -3076,7 +3076,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -3186,7 +3186,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -3297,7 +3297,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -3408,7 +3408,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -3518,7 +3518,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -3601,7 +3601,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -3719,7 +3719,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -3802,7 +3802,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -3864,7 +3864,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -3926,7 +3926,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -3997,7 +3997,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -4059,7 +4059,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -4121,7 +4121,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -4183,7 +4183,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -4245,7 +4245,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -4345,7 +4345,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -4445,7 +4445,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -4555,7 +4555,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -4646,7 +4646,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -4782,7 +4782,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -4891,7 +4891,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -5019,7 +5019,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -5119,7 +5119,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -5224,7 +5224,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -5324,7 +5324,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -5415,7 +5415,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -5542,7 +5542,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -5640,7 +5640,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -5742,7 +5742,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -5797,7 +5797,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -5852,7 +5852,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -5935,7 +5935,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -6018,7 +6018,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -6101,7 +6101,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -6268,7 +6268,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -6366,7 +6366,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -6606,7 +6606,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -6719,7 +6719,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -6883,7 +6883,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -6994,7 +6994,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -7046,7 +7046,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -7098,7 +7098,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -7150,7 +7150,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -7202,7 +7202,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -7285,7 +7285,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -7368,7 +7368,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -7451,7 +7451,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -7534,7 +7534,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -7643,7 +7643,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -7726,7 +7726,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -7809,7 +7809,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -7893,7 +7893,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -7981,7 +7981,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -8069,7 +8069,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -8177,7 +8177,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -8313,7 +8313,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
diff --git a/src/bin/dhcp6/tests/get_config_unittest.cc b/src/bin/dhcp6/tests/get_config_unittest.cc
index 97298495d1e4c39671001010f3099fb7f84065c9..810576f275b5f6c8fb7f0f8bf56b4ceb09c12498 100644
--- a/src/bin/dhcp6/tests/get_config_unittest.cc
+++ b/src/bin/dhcp6/tests/get_config_unittest.cc
@@ -1882,7 +1882,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -1947,7 +1947,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -2035,7 +2035,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -2189,7 +2189,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -2343,7 +2343,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -2497,7 +2497,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -2585,7 +2585,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -2674,7 +2674,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -2763,7 +2763,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -2881,7 +2881,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -2969,7 +2969,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -3058,7 +3058,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -3149,7 +3149,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -3255,7 +3255,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -3344,7 +3344,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -3415,7 +3415,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -3486,7 +3486,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -3566,7 +3566,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -3637,7 +3637,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -3708,7 +3708,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -3813,7 +3813,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -3918,7 +3918,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -4033,7 +4033,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -4134,7 +4134,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -4275,7 +4275,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -4403,7 +4403,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -4544,7 +4544,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -4647,7 +4647,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -4754,7 +4754,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -4819,7 +4819,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -4884,7 +4884,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -4972,7 +4972,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -5060,7 +5060,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -5217,7 +5217,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -5320,7 +5320,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -5431,7 +5431,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -5519,7 +5519,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -5726,7 +5726,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -5837,7 +5837,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -5902,7 +5902,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -5967,7 +5967,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -6143,7 +6143,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -6254,7 +6254,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -6319,7 +6319,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -6380,7 +6380,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -6441,7 +6441,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -6502,7 +6502,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -6577,7 +6577,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -6665,7 +6665,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -6753,7 +6753,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -6842,7 +6842,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -6936,7 +6936,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -7030,7 +7030,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -7120,7 +7120,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -7211,7 +7211,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -7307,7 +7307,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -7413,7 +7413,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -7563,7 +7563,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
@@ -7753,7 +7753,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 500,\n"
-"            \"enable-queue\": true,\n"
+"            \"enable-queue\": false,\n"
 "            \"queue-type\": \"kea-ring6\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
diff --git a/src/lib/dhcpsrv/parsers/simple_parser4.cc b/src/lib/dhcpsrv/parsers/simple_parser4.cc
index 2049ae68a5121e1a2b0b25a8572b4665841a4e67..4f90553af39253592c1c8c4f42a8b837ae206885 100644
--- a/src/lib/dhcpsrv/parsers/simple_parser4.cc
+++ b/src/lib/dhcpsrv/parsers/simple_parser4.cc
@@ -137,7 +137,7 @@ const ParamsList SimpleParser4::INHERIT_TO_SUBNET4 = {
 
 /// @brief This table defines default values for dhcp-queue-control in DHCPv4.
 const SimpleDefaults SimpleParser4::DHCP_QUEUE_CONTROL4_DEFAULTS = {
-    { "enable-queue",   Element::boolean, "true"},
+    { "enable-queue",   Element::boolean, "false"},
     { "queue-type", Element::string,  "kea-ring4"},
     { "capacity",  Element::integer, "500"}
 };
diff --git a/src/lib/dhcpsrv/parsers/simple_parser6.cc b/src/lib/dhcpsrv/parsers/simple_parser6.cc
index 5504b449a299b31188aecb77d0868e196d07df6e..df07d0d4274060f1185c80ce32bdd9d14e61f983 100644
--- a/src/lib/dhcpsrv/parsers/simple_parser6.cc
+++ b/src/lib/dhcpsrv/parsers/simple_parser6.cc
@@ -119,7 +119,7 @@ const ParamsList SimpleParser6::INHERIT_TO_SUBNET6 = {
 
 /// @brief This table defines default values for dhcp-queue-control in DHCPv4.
 const SimpleDefaults SimpleParser6::DHCP_QUEUE_CONTROL6_DEFAULTS = {
-    { "enable-queue",   Element::boolean, "true"},
+    { "enable-queue",   Element::boolean, "false"},
     { "queue-type", Element::string,  "kea-ring6"},
     { "capacity",  Element::integer, "500"}
 };