diff --git a/src/CADShared/ExtensionMethod/Entity/BlockReferenceEx.cs b/src/CADShared/ExtensionMethod/Entity/BlockReferenceEx.cs
index cdeda3235a45a8008fbae8c737731395491d4793..b258f3a112033e3bd479d17765f13ea867630b94 100644
--- a/src/CADShared/ExtensionMethod/Entity/BlockReferenceEx.cs
+++ b/src/CADShared/ExtensionMethod/Entity/BlockReferenceEx.cs
@@ -146,9 +146,9 @@ public static void ChangeBlockAttribute(this BlockReference blockReference,
                 att = (AttributeReference)item;
             }
 
-            using (att.ForWrite())
+            if (propertyNameValues.TryGetValue(att.Tag, out var value))
             {
-                if (propertyNameValues.TryGetValue(att.Tag, out var value))
+                using (att.ForWrite())
                 {
                     att.TextString = value;
                     att.AdjustAlignment(blockReference.Database);