diff --git a/Svc/DpCatalog/DpCatalog.cpp b/Svc/DpCatalog/DpCatalog.cpp
index 30f4325301..8e472e0131 100644
--- a/Svc/DpCatalog/DpCatalog.cpp
+++ b/Svc/DpCatalog/DpCatalog.cpp
@@ -381,7 +381,10 @@ Fw::CmdResponse DpCatalog::fillBinaryTree() {
     FwSizeType totalFiles = 0;
 
     // get file listings from file system
-    for (FwSizeType dir = 0; dir < this->m_numDirectories; dir++) {
+    const FwSizeType numDirs = (this->m_numDirectories <= DP_MAX_DIRECTORIES)
+                                   ? this->m_numDirectories
+                                   : static_cast<FwSizeType>(DP_MAX_DIRECTORIES);
+    for (FwSizeType dir = 0; dir < numDirs; dir++) {
         // read in each directory and keep track of total
         this->log_ACTIVITY_LO_ProcessingDirectory(this->m_directories[dir]);
         FwSizeType filesRead = 0;