diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 6cc5ac630..e3e376391 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -64,19 +64,21 @@ if [ -z "$ZSH_COMPDUMP" ]; then
   ZSH_COMPDUMP="${ZDOTDIR:-${HOME}}/.zcompdump-${SHORT_HOST}-${ZSH_VERSION}"
 fi
 
-if [[ $ZSH_DISABLE_COMPFIX != true ]]; then
-  # If completion insecurities exist, warn the user without enabling completions.
-  if ! compaudit &>/dev/null; then
-    # This function resides in the "lib/compfix.zsh" script sourced above.
-    handle_completion_insecurities
-  # Else, enable and cache completions to the desired file.
-  else
-    compinit -d "${ZSH_COMPDUMP}"
-  fi
-else
-  compinit -i -d "${ZSH_COMPDUMP}"
-fi
 
+if [[ $ZSH_DISABLE_COMPINIT != true ]]; then
+  if [[ $ZSH_DISABLE_COMPFIX != true ]]; then
+      # If completion insecurities exist, warn the user without enabling completions.
+      if ! compaudit &>/dev/null; then
+        # This function resides in the "lib/compfix.zsh" script sourced above.
+        handle_completion_insecurities
+      # Else, enable and cache completions to the desired file.
+      else
+        compinit -d "${ZSH_COMPDUMP}"
+      fi
+  else
+      compinit -i -d "${ZSH_COMPDUMP}"
+  fi
+fi
 # Load all of the plugins that were defined in ~/.zshrc
 for plugin ($plugins); do
   if [ -f $ZSH_CUSTOM/plugins/$plugin/$plugin.plugin.zsh ]; then