diff --git a/changelogs/unreleased/sh-thread-safe-markdown.yml b/changelogs/unreleased/sh-thread-safe-markdown.yml
new file mode 100644
index 00000000000..af7d9d58a9f
--- /dev/null
+++ b/changelogs/unreleased/sh-thread-safe-markdown.yml
@@ -0,0 +1,5 @@
+---
+title: Make Redcarpet Markdown renderer thread-safe
+merge_request:
+author:
+type: fixed
diff --git a/lib/banzai/filter/markdown_filter.rb b/lib/banzai/filter/markdown_filter.rb
index ee73fa91589..9cac303e645 100644
--- a/lib/banzai/filter/markdown_filter.rb
+++ b/lib/banzai/filter/markdown_filter.rb
@@ -1,6 +1,18 @@
 module Banzai
   module Filter
     class MarkdownFilter < HTML::Pipeline::TextFilter
+      # https://github.com/vmg/redcarpet#and-its-like-really-simple-to-use
+      REDCARPET_OPTIONS = {
+        fenced_code_blocks:  true,
+        footnotes:           true,
+        lax_spacing:         true,
+        no_intra_emphasis:   true,
+        space_after_headers: true,
+        strikethrough:       true,
+        superscript:         true,
+        tables:              true
+      }.freeze
+
       def initialize(text, context = nil, result = nil)
         super text, context, result
         @text = @text.delete "\r"
@@ -13,27 +25,11 @@ module Banzai
       end
 
       def self.renderer
-        @renderer ||= begin
+        Thread.current[:banzai_markdown_renderer] ||= begin
           renderer = Banzai::Renderer::HTML.new
-          Redcarpet::Markdown.new(renderer, redcarpet_options)
+          Redcarpet::Markdown.new(renderer, REDCARPET_OPTIONS)
         end
       end
-
-      def self.redcarpet_options
-        # https://github.com/vmg/redcarpet#and-its-like-really-simple-to-use
-        @redcarpet_options ||= {
-          fenced_code_blocks:  true,
-          footnotes:           true,
-          lax_spacing:         true,
-          no_intra_emphasis:   true,
-          space_after_headers: true,
-          strikethrough:       true,
-          superscript:         true,
-          tables:              true
-        }.freeze
-      end
-
-      private_class_method :redcarpet_options
     end
   end
 end