diff --git a/filecontent/src/org/labkey/filecontent/FileContentServiceImpl.java b/filecontent/src/org/labkey/filecontent/FileContentServiceImpl.java
index 22c9bd25343..3e1385c15d1 100644
--- a/filecontent/src/org/labkey/filecontent/FileContentServiceImpl.java
+++ b/filecontent/src/org/labkey/filecontent/FileContentServiceImpl.java
@@ -1399,15 +1399,7 @@ else if (assayFilesPath != null && URIUtil.isDescendant(assayFilesPath.toUri(),
 
             if (relPath != null)
             {
-                if (!isCloudRoot(container))
-                {
-                    relPath = Path.parse(FilenameUtils.separatorsToUnix(relPath)).encode();
-                }
-                else
-                {
-                    // Do not encode path from S3 folder.  It is already encoded.
-                    relPath = Path.parse(FilenameUtils.separatorsToUnix(relPath)).toString();
-                }
+                relPath = Path.parse(FilenameUtils.separatorsToUnix(relPath)).encode();
 
                 return switch (type)
                 {