diff --git a/modules/lang/org/autoload/org.el b/modules/lang/org/autoload/org.el
index 2baf97e79..7b8b3b012 100644
--- a/modules/lang/org/autoload/org.el
+++ b/modules/lang/org/autoload/org.el
@@ -486,7 +486,8 @@ Made for `org-tab-first-hook'."
                            (evil-emacs-state-p))
                        (or (and (bound-and-true-p yas--tables)
                                 (gethash major-mode yas--tables))
-                           (progn (yas-reload-all) t))
+                           (with-memoization (get 'yas-reload-all 'reloaded)
+                             (always (yas-reload-all))))
                        (yas--templates-for-key-at-point))
                   (yas-expand)
                   t)