diff --git a/source/java/org/alfresco/repo/audit/AuditComponentImpl.java b/source/java/org/alfresco/repo/audit/AuditComponentImpl.java
index 85e034d3db..a633026472 100644
--- a/source/java/org/alfresco/repo/audit/AuditComponentImpl.java
+++ b/source/java/org/alfresco/repo/audit/AuditComponentImpl.java
@@ -561,7 +561,15 @@ public class AuditComponentImpl implements AuditComponent
                     trimStringsIfNecessary(auditValue);
                 }
             }
-            collection.addAll(strings);
+            
+            try
+            {
+                collection.addAll(strings);
+            }
+            catch (UnsupportedOperationException e)
+            {
+                // nothing to do in the case of unmodifiable collection
+            }
         }
     }
     
diff --git a/source/test-java/org/alfresco/repo/audit/AuditComponentTest.java b/source/test-java/org/alfresco/repo/audit/AuditComponentTest.java
index 7891ad8ccc..a397e9e1cc 100644
--- a/source/test-java/org/alfresco/repo/audit/AuditComponentTest.java
+++ b/source/test-java/org/alfresco/repo/audit/AuditComponentTest.java
@@ -1005,6 +1005,7 @@ public class AuditComponentTest extends TestCase
                 values.put("/3.1/4.2", mlTextValue);
                 values.put("map", map);
                 values.put("collection", list);
+                values.put("unmodifiableCollection", (Serializable) Collections.unmodifiableCollection(list));
 
                 auditComponent.recordAuditValues("/test/one.one/two.one", values);