diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES-fs-encryption.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES-fs-encryption.txt
index f8289ac66cb..b88b619247d 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES-fs-encryption.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES-fs-encryption.txt
@@ -85,3 +85,6 @@ fs-encryption (Unreleased)
     to a non-directory file. (clamb)
 
     HDFS-6807. Fix TestReservedRawPaths. (clamb)
+
+    HDFS-6814. Mistakenly dfs.namenode.list.encryption.zones.num.responses configured
+    as boolean. (umamahesh)
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml b/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml
index 961c214c855..3606180de32 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml
@@ -2054,7 +2054,7 @@
 
 <property>
   <name>dfs.namenode.list.encryption.zones.num.responses</name>
-  <value>false</value>
+  <value>100</value>
   <description>When listing encryption zones, the maximum number of zones
     that will be returned in a batch. Fetching the list incrementally in
     batches improves namenode performance.