diff --git a/server/src/main/java/org/red5/server/PersistableAttributeStore.java b/server/src/main/java/org/red5/server/PersistableAttributeStore.java
index c00a8f50acb7046530f41c237ed1d04252c12f25..30962a740642c371cadc09166fab637d3d9ff1c8 100644
--- a/server/src/main/java/org/red5/server/PersistableAttributeStore.java
+++ b/server/src/main/java/org/red5/server/PersistableAttributeStore.java
@@ -248,17 +248,15 @@ public class PersistableAttributeStore extends AttributeStore implements IPersis
     /** {@inheritDoc} */
     @Override
     public boolean setAttributes(Map<String, Object> values) {
-        boolean success = super.setAttributes(values);
         modified();
-        return success;
+        return super.setAttributes(values);
     }
 
     /** {@inheritDoc} */
     @Override
     public boolean setAttributes(IAttributeStore values) {
-        boolean success = super.setAttributes(values);
         modified();
-        return success;
+        return super.setAttributes(values);
     }
 
     /**