diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el
index 9eab03dedc3..8a0921aebd0 100644
--- a/lisp/use-package/use-package.el
+++ b/lisp/use-package/use-package.el
@@ -422,8 +422,7 @@ manually updated package."
         (add-to-list 'package-pinned-packages (cons package archive-name))
       (error "Archive '%s' requested for package '%s' is not available."
              archive-name package))
-    (when (and (boundp 'package--initialized)
-	       (not package--initialized))
+    (unless (bound-and-true-p package--initialized)
       (package-initialize t))))
 
 (defun use-package-handler/:pin (name keyword archive-name rest state)