diff --git a/taglib/mpeg/id3v2/id3v2tag.cpp b/taglib/mpeg/id3v2/id3v2tag.cpp
index e8fa23df..267a45d0 100644
--- a/taglib/mpeg/id3v2/id3v2tag.cpp
+++ b/taglib/mpeg/id3v2/id3v2tag.cpp
@@ -608,9 +608,11 @@ ByteVector ID3v2::Tag::render(int version) const
 
     // Padding won't increase beyond 1% of the file size.
 
-    const uint threshold = d->file->length() / 100; // should be ulonglong in taglib2.
-    if(paddingSize > d->paddingSize && paddingSize > threshold)
-      paddingSize = DefaultPaddingSize;
+    if(paddingSize > DefaultPaddingSize) {
+      const uint threshold = d->file->length() / 100; // should be ulonglong in taglib2.
+      if(paddingSize > threshold)
+        paddingSize = DefaultPaddingSize;
+    }
   }
 
   tagData.append(ByteVector(paddingSize, '\0'));