diff --git a/core/core-micro-state.el b/core/core-micro-state.el
index 56fc0c031..807d90f8f 100644
--- a/core/core-micro-state.el
+++ b/core/core-micro-state.el
@@ -164,17 +164,20 @@ used."
          (doc-body
           `((let ((bdoc ,@binding-doc)
                   (defdoc ,@default-doc))
-              (if bdoc
-                  (apply ',msg-func
-                         (list (spacemacs//micro-state-propertize-doc
-                                (format "%S: %s" ',name bdoc))))
-                (when (and defdoc
-                           ',wrapped (not (plist-get ',binding :exit)))
-                  (spacemacs//micro-state-set-minibuffer-height defdoc)
-                  (apply ',msg-func
-                         (list (spacemacs//micro-state-propertize-doc
-                                (format "%S: %s" ',name defdoc))))
-                  defdoc)))))
+              (cond
+               (bdoc
+                (apply ',msg-func
+                       (list (spacemacs//micro-state-propertize-doc
+                              (format "%S: %s" ',name bdoc))))
+                bdoc)
+               ((and defdoc
+                     ',wrapped
+                     (not (plist-get ',binding :exit)))
+                (spacemacs//micro-state-set-minibuffer-height defdoc)
+                (apply ',msg-func
+                       (list (spacemacs//micro-state-propertize-doc
+                              (format "%S: %s" ',name defdoc))))
+                defdoc)))))
          (wrapper-func
           (if (and (boundp wrapped)
                    (eval `(keymapp ,wrapped)))