diff --git a/changelog.rst b/changelog.rst
index e8f2f3cae..8864a88d2 100644
--- a/changelog.rst
+++ b/changelog.rst
@@ -1,5 +1,9 @@
-Upcoming
-========
+Upcoming (TBD)
+==============
+
+Bug fixes:
+----------
+* Restore cursor shape behaviour for Emacs mode
 
 Features:
 ---------
diff --git a/pgcli/main.py b/pgcli/main.py
index 6f986e4c1..1112c8fca 100644
--- a/pgcli/main.py
+++ b/pgcli/main.py
@@ -1103,7 +1103,7 @@ def get_continuation(width, line_number, is_soft_wrap):
                 enable_suspend=True,
                 editing_mode=EditingMode.VI if self.vi_mode else EditingMode.EMACS,
                 search_ignore_case=True,
-                cursor=ModalCursorShapeConfig(),
+                cursor=ModalCursorShapeConfig() if self.vi_mode else None,
             )
 
             return prompt_app