diff --git a/lib/liquid/tokenizer.rb b/lib/liquid/tokenizer.rb
index a4ba496c..fc65f8a0 100644
--- a/lib/liquid/tokenizer.rb
+++ b/lib/liquid/tokenizer.rb
@@ -68,6 +68,7 @@ module Liquid
 
     def shift
       token = @tokens[@offset]
+      @tokens[@offset] = nil
 
       return nil unless token