diff --git a/ale_linters/gitcommit/gitlint.vim b/ale_linters/gitcommit/gitlint.vim
index ec3bfb0b..a9c4822d 100644
--- a/ale_linters/gitcommit/gitlint.vim
+++ b/ale_linters/gitcommit/gitlint.vim
@@ -23,8 +23,10 @@ function! ale_linters#gitcommit#gitlint#Handle(buffer, lines) abort
     for l:match in ale#util#GetMatches(a:lines, l:pattern)
         let l:code = l:match[2]
 
-        if l:code is# 'T2' && !ale#Var(a:buffer, 'warn_about_trailing_whitespace')
-            continue
+        if !ale#Var(a:buffer, 'warn_about_trailing_whitespace')
+            if l:code is# 'T2' || l:code is# 'B2'
+                continue
+            endif
         endif
 
         let l:item = {
diff --git a/test/handler/test_gitlint_handler.vader b/test/handler/test_gitlint_handler.vader
index 60d632a0..5c531664 100644
--- a/test/handler/test_gitlint_handler.vader
+++ b/test/handler/test_gitlint_handler.vader
@@ -61,6 +61,19 @@ Execute(Disabling trailing whitespace warnings should work):
   \   '8: T2 Trailing whitespace',
   \])
 
+  AssertEqual
+  \ [
+  \   {
+  \     'lnum': 8,
+  \     'type': 'E',
+  \     'text': 'Trailing whitespace',
+  \     'code': 'B2',
+  \   },
+  \ ],
+  \ ale_linters#gitcommit#gitlint#Handle(bufnr(''), [
+  \   '8: B2 Trailing whitespace',
+  \])
+
   let b:ale_warn_about_trailing_whitespace = 0
 
   AssertEqual
@@ -68,3 +81,9 @@ Execute(Disabling trailing whitespace warnings should work):
   \ ale_linters#gitcommit#gitlint#Handle(bufnr(''), [
   \   '8: T2 Trailing whitespace',
   \ ])
+
+  AssertEqual
+  \ [],
+  \ ale_linters#gitcommit#gitlint#Handle(bufnr(''), [
+  \   '8: B2 Trailing whitespace',
+  \ ])