diff --git a/core/src/codecs/default/DefaultVectorsFormat.cpp b/core/src/codecs/default/DefaultVectorsFormat.cpp
index 9e6e50d2f00d70e13c8afb03d77961fb086cbd3d..d99dcbfbcae71712c078e7041aa5b5ee0cb02c0b 100644
--- a/core/src/codecs/default/DefaultVectorsFormat.cpp
+++ b/core/src/codecs/default/DefaultVectorsFormat.cpp
@@ -152,11 +152,11 @@ DefaultVectorsFormat::read_uids(const storage::FSHandlerPtr& fs_ptr, std::vector
     typedef boost::filesystem::directory_iterator d_it;
     d_it it_end;
     d_it it(target_path);
-    //    for (auto& it : boost::filesystem::directory_iterator(dir_path)) {
     for (; it != it_end; ++it) {
         const auto& path = it->path();
         if (path.extension().string() == user_id_extension_) {
             read_uids_internal(fs_ptr, path.string(), uids);
+            break;
         }
     }
 }
@@ -177,11 +177,11 @@ DefaultVectorsFormat::read_vectors(const storage::FSHandlerPtr& fs_ptr, off_t of
     typedef boost::filesystem::directory_iterator d_it;
     d_it it_end;
     d_it it(target_path);
-    //    for (auto& it : boost::filesystem::directory_iterator(dir_path)) {
     for (; it != it_end; ++it) {
         const auto& path = it->path();
         if (path.extension().string() == raw_vector_extension_) {
             read_vectors_internal(fs_ptr, path.string(), offset, num_bytes, raw_vectors);
+            break;
         }
     }
 }