diff --git a/indra/llfilesystem/llfilesystem.cpp b/indra/llfilesystem/llfilesystem.cpp
index 80f18f55b0fecf7ac0686b572de2f3cbab6ab6f4..72024ba3e2fc8c04a6dc070c3ac65cb792440615 100644
--- a/indra/llfilesystem/llfilesystem.cpp
+++ b/indra/llfilesystem/llfilesystem.cpp
@@ -256,8 +256,8 @@ S32 LLFileSystem::getSize()
 
 S32 LLFileSystem::getMaxSize()
 {
-    // offer up a huge size since we don't care what the max is
-    return INT_MAX;
+    // Max size at 50mb to avoid error conditions resulting in huge files on disk
+    return 52428800;
 }
 
 BOOL LLFileSystem::rename(const LLUUID& new_id, const LLAssetType::EType new_type)