diff --git a/lib/misc.zsh b/lib/misc.zsh
index 8d6727251..a01627d9e 100644
--- a/lib/misc.zsh
+++ b/lib/misc.zsh
@@ -7,11 +7,3 @@ bindkey "^[m" copy-prev-shell-word
 
 ## jobs
 setopt long_list_jobs
-
-# Check for updates on initial load...
-if [ "$DISABLE_AUTO_UPDATE" = "true" ]
-then
-  return
-else
-  /bin/sh $ZSH/tools/check_for_upgrade.sh
-fi
diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 6e73519b5..4b5959625 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -6,3 +6,11 @@ for config_file ($ZSH/lib/*.zsh) source $config_file
 
 # Load all of your custom configurations from custom/
 for config_file ($ZSH/custom/*.zsh) source $config_file
+
+# Check for updates on initial load...
+if [ "$DISABLE_AUTO_UPDATE" = "true" ]
+then
+  return
+else
+  /bin/sh $ZSH/tools/check_for_upgrade.sh
+fi