diff --git a/lib/redmine/wiki_formatting/common_mark/sanitization_filter.rb b/lib/redmine/wiki_formatting/common_mark/sanitization_filter.rb
index cdefc372b..046866e05 100644
--- a/lib/redmine/wiki_formatting/common_mark/sanitization_filter.rb
+++ b/lib/redmine/wiki_formatting/common_mark/sanitization_filter.rb
@@ -86,7 +86,7 @@ module Redmine
             node = env[:node]
             return unless node.name == "a" || node.name == "li"
             return unless node.has_attribute?("id")
-            return if node.name == "a" && node["id"] =~ /\Afnref-\d+\z/
+            return if node.name == "a" && node["id"] =~ /\Afnref(-\d+){1,2}\z/
             return if node.name == "li" && node["id"] =~ /\Afn-\d+\z/
 
             node.remove_attribute("id")
diff --git a/test/unit/lib/redmine/wiki_formatting/common_mark/sanitization_filter_test.rb b/test/unit/lib/redmine/wiki_formatting/common_mark/sanitization_filter_test.rb
index d3956e802..bf7e5655f 100644
--- a/test/unit/lib/redmine/wiki_formatting/common_mark/sanitization_filter_test.rb
+++ b/test/unit/lib/redmine/wiki_formatting/common_mark/sanitization_filter_test.rb
@@ -47,10 +47,14 @@ if Object.const_defined?(:CommonMarker)
     end
 
     def test_should_support_footnotes
-      input = %(<a href="#fn-1" id="fnref-1">foo</a>)
-      assert_equal input, filter(input)
-      input = %(<ol><li id="fn-1">footnote</li></ol>)
-      assert_equal input, filter(input)
+      [
+        %(<a href="#fn-1" id="fnref-1">foo</a>),
+        %(<a href="#fn-1" id="fnref-1-2">foo</a>),
+        %(<ol><li id="fn-1">footnote</li></ol>),
+      ].each do |input|
+        assert_equal input, filter(input)
+        assert_equal input, filter(input)
+      end
     end
 
     def test_should_remove_invalid_ids