diff --git a/lib/liquid/tags/case.rb b/lib/liquid/tags/case.rb
index caa6fff..12d1712 100644
--- a/lib/liquid/tags/case.rb
+++ b/lib/liquid/tags/case.rb
@@ -21,10 +21,10 @@ module Liquid
     def parse(tokens)
       body = new_body
       body = @blocks.last.attachment while parse_body(body, tokens)
-      if blank?
-        @blocks.each { |condition| condition.attachment.remove_blank_strings }
+      @blocks.each do |condition|
+        condition.attachment.remove_blank_strings if blank?
+        condition.attachment.freeze
       end
-      @blocks.each { |condition| condition.attachment.freeze }
     end
 
     def nodelist
diff --git a/lib/liquid/tags/if.rb b/lib/liquid/tags/if.rb
index 7bef1af..d4de9c2 100644
--- a/lib/liquid/tags/if.rb
+++ b/lib/liquid/tags/if.rb
@@ -31,10 +31,10 @@ module Liquid
     def parse(tokens)
       while parse_body(@blocks.last.attachment, tokens)
       end
-      if blank?
-        @blocks.each { |condition| condition.attachment.remove_blank_strings }
+      @blocks.each do |block|
+        block.attachment.remove_blank_strings if blank?
+        block.attachment.freeze
       end
-      @blocks.each { |block| block.attachment.freeze }
     end
 
     def unknown_tag(tag, markup, tokens)