diff --git a/repertory/librepertory/src/providers/s3/s3_provider.cpp b/repertory/librepertory/src/providers/s3/s3_provider.cpp
index 2b9f935e..5c22978f 100644
--- a/repertory/librepertory/src/providers/s3/s3_provider.cpp
+++ b/repertory/librepertory/src/providers/s3/s3_provider.cpp
@@ -326,7 +326,7 @@ auto s3_provider::get_directory_items_impl(
   }
 
   const auto add_directory_item =
-      [&](bool directory, const std::string &name,
+      [&](bool directory, const std::string &name, std::uint64_t last_modified,
           std::function<std::uint64_t(const directory_item &)> get_size)
       -> api_error {
     auto child_api_path =
@@ -353,9 +353,8 @@ auto s3_provider::get_directory_items_impl(
           return ret;
         }
       } else {
-        auto file =
-            create_api_file(child_api_path, child_object_name, dir_item.size,
-                            get_last_modified(directory, child_api_path));
+        auto file = create_api_file(child_api_path, child_object_name,
+                                    dir_item.size, last_modified);
         ret = add_if_not_found(file, child_object_name);
         if (ret != api_error::success) {
           return ret;
@@ -376,7 +375,7 @@ auto s3_provider::get_directory_items_impl(
   auto node_list = doc.select_nodes("/ListBucketResult/CommonPrefixes/Prefix");
   for (auto &&node : node_list) {
     add_directory_item(
-        true, node.node().text().as_string(),
+        true, node.node().text().as_string(), utils::time::get_time_now(),
         [](const directory_item &) -> std::uint64_t { return 0U; });
   }
 
@@ -386,8 +385,10 @@ auto s3_provider::get_directory_items_impl(
         node.node().select_node("Key").node().text().as_string());
     if (child_object_name != utils::path::create_api_path(prefix)) {
       auto size = node.node().select_node("Size").node().text().as_ullong();
+      auto last_modified = convert_api_date(
+          node.node().select_node("LastModified").node().text().as_string());
       add_directory_item(
-          false, child_object_name,
+          false, child_object_name, last_modified,
           [&is_encrypted, &size](const directory_item &) -> std::uint64_t {
             return is_encrypted ? utils::encryption::encrypting_reader::
                                       calculate_decrypted_size(size)