diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el
index 3b5174700d5..d88f2311043 100644
--- a/lisp/use-package/use-package.el
+++ b/lisp/use-package/use-package.el
@@ -499,10 +499,12 @@ For full documentation. please see commentary.
                    ,init-body
                    ,(unless (null config-body)
                       `(eval-after-load ,name-string
-                         '(if ,requires-test
-                              (with-elapsed-timer
-                                  ,(format "Configuring package %s" name-string)
-                                ,config-body))))
+                         (quote
+                           (if ,requires-test
+                               ,(macroexpand-all
+                                  `(with-elapsed-timer
+                                       ,(format "Configuring package %s" name-string)
+                                     ,config-body))))))
                    t))
             `(if (and ,(or predicate t)
                       ,requires-test)