diff --git a/lib/liquid/tags/cycle.rb b/lib/liquid/tags/cycle.rb
index d4f7166a..745fd353 100644
--- a/lib/liquid/tags/cycle.rb
+++ b/lib/liquid/tags/cycle.rb
@@ -74,6 +74,8 @@ module Liquid
         break unless p.consume?(:comma)
       end
 
+      p.consume(:end_of_string)
+
       unless @is_named
         @name = @variables.to_s
         @is_named = !@name.match?(/\w+:0x\h{8}/)
diff --git a/test/integration/tags/cycle_tag_test.rb b/test/integration/tags/cycle_tag_test.rb
index a4042479..dde8a1bc 100644
--- a/test/integration/tags/cycle_tag_test.rb
+++ b/test/integration/tags/cycle_tag_test.rb
@@ -76,4 +76,40 @@ class CycleTagTest < Minitest::Test
       assert_match(expected_error, error2.message)
     end
   end
+
+  def test_cycle_with_trailing_elements
+    assignments = "{% assign a = 'A' %}{% assign n = 'N' %}"
+
+    template1 = "#{assignments}{% cycle       'a'  'b', 'c' %}"
+    template2 = "#{assignments}{% cycle name: 'a'  'b', 'c' %}"
+    template3 = "#{assignments}{% cycle name: 'a', 'b'  'c' %}"
+    template4 = "#{assignments}{% cycle n  e: 'a', 'b', 'c' %}"
+    template5 = "#{assignments}{% cycle n  e  'a', 'b', 'c' %}"
+
+    [:lax, :strict].each do |mode|
+      with_error_mode(mode) do
+        assert_template_result("a", template1)
+        assert_template_result("a", template2)
+        assert_template_result("a", template3)
+        assert_template_result("N", template4)
+        assert_template_result("N", template5)
+      end
+    end
+
+    with_error_mode(:rigid) do
+      error1 = assert_raises(Liquid::SyntaxError) { Template.parse(template1) }
+      error2 = assert_raises(Liquid::SyntaxError) { Template.parse(template2) }
+      error3 = assert_raises(Liquid::SyntaxError) { Template.parse(template3) }
+      error4 = assert_raises(Liquid::SyntaxError) { Template.parse(template4) }
+      error5 = assert_raises(Liquid::SyntaxError) { Template.parse(template5) }
+
+      expected_error = /Expected end_of_string but found/
+
+      assert_match(expected_error, error1.message)
+      assert_match(expected_error, error2.message)
+      assert_match(expected_error, error3.message)
+      assert_match(expected_error, error4.message)
+      assert_match(expected_error, error5.message)
+    end
+  end
 end