diff --git a/src/main/java/org/apache/hadoop/hdfs/server/namenode/AbstractQueryEngine.java b/src/main/java/org/apache/hadoop/hdfs/server/namenode/AbstractQueryEngine.java
index d4f83a9..9ee5b36 100644
--- a/src/main/java/org/apache/hadoop/hdfs/server/namenode/AbstractQueryEngine.java
+++ b/src/main/java/org/apache/hadoop/hdfs/server/namenode/AbstractQueryEngine.java
@@ -402,7 +402,7 @@ public Function<INode, Long> getSumFunctionForINode(
         break;
       case "diskspaceConsumed":
         toLongFunction =
-            node -> node.asFile().computeFileSize() * node.asFile().getFileReplication();
+            node -> versionLoader.getFilterFunctionToLongForINode("diskspaceConsumed").apply(node);
         break;
       case "blockSize":
         toLongFunction = node -> node.asFile().getPreferredBlockSize();
@@ -534,7 +534,10 @@ private Function<Collection<INode>, Long> getSumFunctionForCollection(String sum
             collection
                 .parallelStream()
                 .mapToLong(
-                    node -> node.asFile().computeFileSize() * node.asFile().getFileReplication())
+                    node ->
+                        versionLoader
+                            .getFilterFunctionToLongForINode("diskspaceConsumed")
+                            .apply(node))
                 .sum();
       case "blockSize":
         return collection ->
diff --git a/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeLoader.java b/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeLoader.java
index a33d739..8d504b8 100644
--- a/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeLoader.java
+++ b/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeLoader.java
@@ -417,9 +417,6 @@ private void handleConfigurationOverrides(Configuration conf, ApplicationConfigu
       LOG.info("Setting: {} to: {}", DFSConfigKeys.DFS_CONTENT_SUMMARY_LIMIT_KEY, 0);
       conf.setInt(DFSConfigKeys.DFS_CONTENT_SUMMARY_LIMIT_KEY, 0);
 
-      LOG.info("Setting: {} to: {}", DFSConfigKeys.DFS_BLOCK_ACCESS_TOKEN_ENABLE_KEY, false);
-      conf.setBoolean(DFSConfigKeys.DFS_BLOCK_ACCESS_TOKEN_ENABLE_KEY, false);
-
       String baseDir = nnaConf.getBaseDir();
       LOG.info("Setting: {} to: {}/dfs/name", DFSConfigKeys.DFS_NAMENODE_NAME_DIR_KEY, baseDir);
       conf.set(DFSConfigKeys.DFS_NAMENODE_NAME_DIR_KEY, new URI(baseDir + "/dfs/name").getPath());