diff --git a/indra/llfilesystem/llfilesystem.cpp b/indra/llfilesystem/llfilesystem.cpp
index 19dfe3cfc7..61cc7756de 100644
--- a/indra/llfilesystem/llfilesystem.cpp
+++ b/indra/llfilesystem/llfilesystem.cpp
@@ -48,6 +48,28 @@ LLFileSystem::LLFileSystem(const LLUUID& file_id, const LLAssetType::EType file_
     mPosition = 0;
     mBytesRead = 0;
     mMode = mode;
+
+    // This block of code was originally called in the read() method but after comments here:
+    // https://bitbucket.org/lindenlab/viewer/commits/e28c1b46e9944f0215a13cab8ee7dded88d7fc90#comment-10537114
+    // we decided to follow Henri's suggestion and move the code to update the last access time here.
+    if (mode == LLFileSystem::READ)
+    {
+        // build the filename (TODO: we do this in a few places - perhaps we should factor into a single function)
+        std::string id;
+        mFileID.toString(id);
+        const std::string extra_info = "";
+        const std::string filename = LLDiskCache::getInstance()->metaDataToFilepath(id, mFileType, extra_info);
+
+        // update the last access time for the file if it exists - this is required
+        // even though we are reading and not writing because this is the
+        // way the cache works - it relies on a valid "last accessed time" for
+        // each file so it knows how to remove the oldest, unused files
+        bool exists = gDirUtilp->fileExists(filename);
+        if (exists)
+        {
+            LLDiskCache::getInstance()->updateFileAccessTime(filename);
+        }
+    }
 }
 
 LLFileSystem::~LLFileSystem()
@@ -153,8 +175,6 @@ S32 LLFileSystem::getFileSize(const LLUUID& file_id, const LLAssetType::EType fi
 BOOL LLFileSystem::read(U8* buffer, S32 bytes)
 {
     FSZoneC(tracy::Color::Gold); // <FS:Beq> measure cache performance
-    // <FS:Ansariel> Cache fixes
-    //BOOL success = TRUE;
     BOOL success = FALSE;
 
     std::string id;
@@ -182,9 +202,9 @@ BOOL LLFileSystem::read(U8* buffer, S32 bytes)
     //    file.close();
 
     //    mPosition += mBytesRead;
-    //    if (!mBytesRead)
+    //    if (mBytesRead)
     //    {
-    //        success = FALSE;
+    //        success = TRUE;
     //    }
     //}
     LLFILE* file = LLFile::fopen(filename, "rb");
@@ -206,15 +226,6 @@ BOOL LLFileSystem::read(U8* buffer, S32 bytes)
     }
     // </FS:Ansariel>
 
-    if (success == TRUE)
-    {
-        // update the last access time for the file - this is required
-        // even though we are reading and not writing because this is the
-        // way the cache works - it relies on a valid "last accessed time" for
-        // each file so it knows how to remove the oldest, unused files
-        LLDiskCache::getInstance()->updateFileAccessTime(filename);
-    }
-
     return success;
 }