diff --git a/src/message.c b/src/message.c
index 2498412..99fe675 100644
--- a/src/message.c
+++ b/src/message.c
@@ -1747,7 +1747,7 @@
 
     // When drawing over the command line no need to clear it later or remove
     // the mode message.
-    if (msg_row >= cmdline_row && msg_col == 0)
+    if (msg_silent == 0 && len > 0 && msg_row >= cmdline_row && msg_col == 0)
     {
 	clear_cmdline = FALSE;
 	mode_displayed = FALSE;
diff --git a/src/testdir/dumps/Test_mode_cleared_after_silent_message_1.dump b/src/testdir/dumps/Test_mode_cleared_after_silent_message_1.dump
new file mode 100644
index 0000000..5a704d6
--- /dev/null
+++ b/src/testdir/dumps/Test_mode_cleared_after_silent_message_1.dump
@@ -0,0 +1,10 @@
+>f+0&#ffffff0|o@1|b|a|r| @68
+|~+0#4040ff13&| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|-+2#0000000&@1| |V|I|S|U|A|L| |-@1| +0&&@34|1| @8|1|,|1| @10|A|l@1| 
diff --git a/src/testdir/dumps/Test_mode_cleared_after_silent_message_2.dump b/src/testdir/dumps/Test_mode_cleared_after_silent_message_2.dump
new file mode 100644
index 0000000..9003845
--- /dev/null
+++ b/src/testdir/dumps/Test_mode_cleared_after_silent_message_2.dump
@@ -0,0 +1,10 @@
+>o+0&#ffffff0@1|b|a|r| @69
+|~+0#4040ff13&| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+| +0#0000000&@56|1|,|1| @10|A|l@1| 
diff --git a/src/testdir/test_messages.vim b/src/testdir/test_messages.vim
index c566bbc..87b1131 100644
--- a/src/testdir/test_messages.vim
+++ b/src/testdir/test_messages.vim
@@ -382,6 +382,29 @@
   call StopVimInTerminal(buf)
 endfunc
 
+func Test_mode_cleared_after_silent_message()
+  CheckRunVimInTerminal
+
+  let lines =<< trim END
+    edit XsilentMessageMode.txt
+    call setline(1, 'foobar')
+    autocmd TextChanged * silent update
+  END
+  call writefile(lines, 'XsilentMessageMode', 'D')
+  let buf = RunVimInTerminal('-S XsilentMessageMode', {'rows': 10})
+
+  call term_sendkeys(buf, 'v')
+  call TermWait(buf)
+  call VerifyScreenDump(buf, 'Test_mode_cleared_after_silent_message_1', {})
+
+  call term_sendkeys(buf, 'd')
+  call TermWait(buf)
+  call VerifyScreenDump(buf, 'Test_mode_cleared_after_silent_message_2', {})
+
+  call StopVimInTerminal(buf)
+  call delete('XsilentMessageMode.txt')
+endfunc
+
 " Test verbose message before echo command
 func Test_echo_verbose_system()
   CheckRunVimInTerminal
diff --git a/src/version.c b/src/version.c
index 6e668fc..9c3f70b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1155,
+/**/
     1154,
 /**/
     1153,