diff --git a/src/plugins/clangformat/clangformatbaseindenter.cpp b/src/plugins/clangformat/clangformatbaseindenter.cpp
index ee168b301f3..09ae5a6bccb 100644
--- a/src/plugins/clangformat/clangformatbaseindenter.cpp
+++ b/src/plugins/clangformat/clangformatbaseindenter.cpp
@@ -355,23 +355,11 @@ TextEditor::Replacements ClangFormatBaseIndenter::replacements(QByteArray buffer
         rangeStart = formattingRangeStart(startBlock, buffer, lastSaveRevision());
 
     adjustFormatStyleForLineBreak(style, replacementsToKeep);
-    if (typedChar == QChar::Null) {
-        if (replacementsToKeep == ReplacementsToKeep::IndentAndBefore) {
-            if (utf8Offset > 0) {
-                buffer.insert(utf8Offset - 1, " //");
-                utf8Offset += 3;
-            }
+    if (replacementsToKeep == ReplacementsToKeep::OnlyIndent) {
+        for (int index = startBlock.blockNumber(); index <= endBlock.blockNumber(); ++index) {
             utf8Length += forceIndentWithExtraText(buffer,
-                                                   cursorPositionInEditor < 0
-                                                       ? endBlock
-                                                       : m_doc->findBlock(cursorPositionInEditor),
+                                                   m_doc->findBlockByNumber(index),
                                                    secondTry);
-        } else {
-            for (int index = startBlock.blockNumber(); index <= endBlock.blockNumber(); ++index) {
-                utf8Length += forceIndentWithExtraText(buffer,
-                                                       m_doc->findBlockByNumber(index),
-                                                       secondTry);
-            }
         }
     }
 
diff --git a/tests/unit/unittest/clangformat-test.cpp b/tests/unit/unittest/clangformat-test.cpp
index 67c31221e51..5f0aaf1d873 100644
--- a/tests/unit/unittest/clangformat-test.cpp
+++ b/tests/unit/unittest/clangformat-test.cpp
@@ -362,6 +362,23 @@ TEST_F(ClangFormat, IndentEmptyLineAndKeepPreviousEmptyLines)
                                              "}"));
 }
 
+TEST_F(ClangFormat, IndentOnElectricCharacterButNotRemoveEmptyLinesBefore)
+{
+    insertLines({"{",
+                 "    ",
+                 "    ",
+                 "if ()",
+                 "}"});
+
+    indenter.indentBlock(doc.findBlockByNumber(3), '(', TextEditor::TabSettings());
+
+    ASSERT_THAT(documentLines(), ElementsAre("{",
+                                             "    ",
+                                             "    ",
+                                             "    if ()",
+                                             "}"));
+}
+
 TEST_F(ClangFormat, IndentFunctionBodyButNotFormatBeforeIt)
 {
     insertLines({"int foo(int a, int b,",