diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index e6398b5094a..372781af041 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-9133
\ No newline at end of file
+9134
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/.gitrev b/mozilla/webtools/bugzilla/.gitrev
index 46fb08c06ab..dfea9832c4c 100644
--- a/mozilla/webtools/bugzilla/.gitrev
+++ b/mozilla/webtools/bugzilla/.gitrev
@@ -1 +1 @@
-e1603d01bbc3523b622db2f295400aa5a5f14509
\ No newline at end of file
+c11b241b985511c01803df200d31afb793f11903
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/Bugzilla.pm b/mozilla/webtools/bugzilla/Bugzilla.pm
index 7d935db4808..af670e90f4b 100644
--- a/mozilla/webtools/bugzilla/Bugzilla.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla.pm
@@ -398,6 +398,8 @@ sub logout_request {
 }
 
 sub markdown {
+    return if !Bugzilla->feature('markdown');
+
     require Bugzilla::Markdown;
     return $_[0]->request_cache->{markdown} ||= Bugzilla::Markdown->new();
 }
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Markdown.pm b/mozilla/webtools/bugzilla/Bugzilla/Markdown.pm
index 6cbe0f6c489..5f1a7d955be 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Markdown.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Markdown.pm
@@ -62,8 +62,7 @@ sub markdown {
     my $text = shift;
     my $user = Bugzilla->user;
 
-    if (Bugzilla->feature('markdown')
-        && $user->settings->{use_markdown}->{is_enabled}
+    if ($user->settings->{use_markdown}->{is_enabled}
         && $user->setting('use_markdown') eq 'on')
     {
         return $self->SUPER::markdown($text, @_);
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Template.pm b/mozilla/webtools/bugzilla/Bugzilla/Template.pm
index 78a3e41202a..aee7933edee 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Template.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Template.pm
@@ -813,8 +813,9 @@ sub create {
                                   my $text = shift;
                                   return unless $text;
 
-                                  if ((ref($comment) eq 'HASH' && $comment->{is_markdown})
-                                       || (ref($comment) eq 'Bugzilla::Comment' && $comment->is_markdown))
+                                  if (Bugzilla->feature('markdown')
+                                      && ((ref($comment) eq 'HASH' && $comment->{is_markdown})
+                                         || (ref($comment) eq 'Bugzilla::Comment' && $comment->is_markdown)))
                                   {
                                       return Bugzilla->markdown->markdown($text);
                                   }