diff --git a/core/autoload/sessions.el b/core/autoload/sessions.el
index 804abaa4c..45dd18ae0 100644
--- a/core/autoload/sessions.el
+++ b/core/autoload/sessions.el
@@ -65,9 +65,6 @@
   "TODO"
   (add-hook 'window-setup-hook #'doom-load-session 'append))
 
-;;;###autoload
-(add-to-list 'command-switch-alist (cons "--restore" #'doom-restore-session-handler))
-
 
 ;;
 ;;; Commands
diff --git a/core/core.el b/core/core.el
index 9815b39aa..980b8e259 100644
--- a/core/core.el
+++ b/core/core.el
@@ -536,7 +536,11 @@ to least)."
   (require 'core-keybinds)
   (require 'core-ui)
   (require 'core-projects)
-  (require 'core-editor))
+  (require 'core-editor)
+
+  (when (cdr command-line-args)
+    (add-to-list 'command-switch-alist
+                 (cons "--restore" #'doom-restore-session-handler))))
 
 (doom-initialize-modules)