diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 221989502..777d8a64b 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -28,6 +28,10 @@ function omz_termsupport_preexec {
   title "$CMD" "%100>...>$2%<<"
 }
 
-autoload -U add-zsh-hook
-add-zsh-hook precmd  omz_termsupport_precmd
-add-zsh-hook preexec omz_termsupport_preexec
+#autoload -U add-zsh-hook
+#add-zsh-hook precmd  omz_termsupport_precmd
+#add-zsh-hook preexec omz_termsupport_preexec
+## Fix for zsh hook compatibility issues 
+if [ -f "/usr/share/zsh/functions/Zle/add-zsh-hook" ] ; then
+    autoload -U add-zsh-hook && add-zsh-hook precmd omz_termsupport_precmd && add-zsh-hook preexec omz_termsupport_preexec
+fi