diff --git a/.config/emacs/README.org b/.config/emacs/README.org
index a403921..13edf78 100644
--- a/.config/emacs/README.org
+++ b/.config/emacs/README.org
@@ -2327,7 +2327,12 @@ Configure Org Msg that automatically writes HTML emails when needed.
      org-msg-default-alternatives '((new . (text))
                                     (reply-to-html . (text html))
                                     (reply-to-text . (text)))
-    org-msg-convert-citation t))
+     org-msg-convert-citation t)
+    ;; https://github.com/jeremy-compostella/org-msg/pull/152
+    (setq mu4e-compose-signature-auto-include nil)
+    (defun dalvrosa/set-org-msg-signature (type alternatives)
+      (setq org-msg-signature (f-read-text message-signature-file)))
+    (advice-add 'org-msg-composition-parameters :before 'dalvrosa/set-org-msg-signature))
 #+end_src
 
 ** Attachment Management
diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index 7f6b680..5234960 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -976,7 +976,12 @@
    org-msg-default-alternatives '((new . (text))
                                   (reply-to-html . (text html))
                                   (reply-to-text . (text)))
-  org-msg-convert-citation t))
+   org-msg-convert-citation t)
+  ;; https://github.com/jeremy-compostella/org-msg/pull/152
+  (setq mu4e-compose-signature-auto-include nil)
+  (defun dalvrosa/set-org-msg-signature (type alternatives)
+    (setq org-msg-signature (f-read-text message-signature-file)))
+  (advice-add 'org-msg-composition-parameters :before 'dalvrosa/set-org-msg-signature))
 
 (setq mu4e-attachment-dir "~/Downloads")