diff --git a/CHANGELOG.develop b/CHANGELOG.develop
index 7b322cef7..9835bd92f 100644
--- a/CHANGELOG.develop
+++ b/CHANGELOG.develop
@@ -1073,6 +1073,8 @@ Other:
   - Enabled =doom= mode-line theme to respect
     =dotspacemacs-display-default-layout= (thanks to Jake Romer)
   - Hide =spacemacs//= command prefixes in which-key (thanks to duianto)
+  - Prevented removal of =eldoc= info when switching to insert state
+    (thanks to Ivan Yonchovski)
 - Fixed:
   - Fixed ~h~ key binding in compilation and grep buffers
     (thanks to Sylvain Benner)
diff --git a/layers/+spacemacs/spacemacs-defaults/packages.el b/layers/+spacemacs/spacemacs-defaults/packages.el
index efa8961c6..86bc774b9 100644
--- a/layers/+spacemacs/spacemacs-defaults/packages.el
+++ b/layers/+spacemacs/spacemacs-defaults/packages.el
@@ -143,7 +143,14 @@
       ;; enable eldoc in IELM
       (add-hook 'ielm-mode-hook #'eldoc-mode)
       ;; don't display eldoc on modeline
-      (spacemacs|hide-lighter eldoc-mode))))
+      (spacemacs|hide-lighter eldoc-mode)
+
+      ;; eldoc-message-commands
+      (eldoc-add-command #'evil-insert)
+      (eldoc-add-command #'evil-insert-line)
+      (eldoc-add-command #'evil-append)
+      (eldoc-add-command #'evil-append-line)
+      (eldoc-add-command #'evil-force-normal-state))))
 
 (defun spacemacs-defaults/init-help-fns+ ()
   (use-package help-fns+
diff --git a/layers/+spacemacs/spacemacs-evil/packages.el b/layers/+spacemacs/spacemacs-evil/packages.el
index eef1d4c7f..fc62b0e7b 100644
--- a/layers/+spacemacs/spacemacs-evil/packages.el
+++ b/layers/+spacemacs/spacemacs-evil/packages.el
@@ -37,7 +37,7 @@
         (hs-minor-mode :location built-in)
         (linum-relative :toggle (version< emacs-version "26"))
         vi-tilde-fringe
-        ))
+        eldoc))
 
 (defun spacemacs-evil/init-evil-anzu ()
   (use-package evil-anzu
@@ -64,6 +64,12 @@
         (setq anzu-mode-line-update-function
               'spacemacs/anzu-update-mode-line)))))
 
+(defun spacemacs-evil/post-init-eldoc ()
+  (eldoc-add-command #'evil-cp-insert)
+  (eldoc-add-command #'evil-cp-insert-at-end-of-form)
+  (eldoc-add-command #'evil-cp-insert-at-beginning-of-form)
+  (eldoc-add-command #'evil-cp-append))
+
 (defun spacemacs-evil/init-evil-args ()
   (use-package evil-args
     :defer t