diff --git a/rubocop/cop/line_break_around_conditional_block.rb b/rubocop/cop/line_break_around_conditional_block.rb
index 3e7021e724ef050331c24bbe5a990fb8d6dd3230..8b6052fee1b4af8066ddc1e54ce4b0d0a0a2cf9b 100644
--- a/rubocop/cop/line_break_around_conditional_block.rb
+++ b/rubocop/cop/line_break_around_conditional_block.rb
@@ -95,7 +95,7 @@ module RuboCop
       end
 
       def end_clause_line?(line)
-        line =~ /^\s*(rescue|else|elsif|when)/
+        line =~ /^\s*(#|rescue|else|elsif|when)/
       end
 
       def begin_line?(line)
diff --git a/spec/rubocop/cop/line_break_around_conditional_block_spec.rb b/spec/rubocop/cop/line_break_around_conditional_block_spec.rb
index 7ddf9141fcd515437ff3ff24a05a69341ef2c819..03eeffe6483277b719d776b43fb39e150af3fb91 100644
--- a/spec/rubocop/cop/line_break_around_conditional_block_spec.rb
+++ b/spec/rubocop/cop/line_break_around_conditional_block_spec.rb
@@ -256,6 +256,18 @@ describe RuboCop::Cop::LineBreakAroundConditionalBlock do
       expect(cop.offenses).to be_empty
     end
 
+    it "doesn't flag violation for #{conditional} followed by a comment" do
+      source = <<~RUBY
+          #{conditional} condition
+            do_something
+          end
+          # a short comment
+      RUBY
+      inspect_source(source)
+
+      expect(cop.offenses).to be_empty
+    end
+
     it "doesn't flag violation for #{conditional} followed by an end" do
       source = <<~RUBY
           class Foo