diff --git a/zsh-syntax-highlighting.zsh b/zsh-syntax-highlighting.zsh
index 02d45f9..8476c1a 100644
--- a/zsh-syntax-highlighting.zsh
+++ b/zsh-syntax-highlighting.zsh
@@ -50,7 +50,9 @@ if true; then
 fi
 
 integer zsh_highlight_use_redrawhook
-if zle -la .match-bracket; then
+if autoload -U +X -- add-zle-hook-widget 2>/dev/null;
+   [[ "${${(@f)"$(which -- add-zle-hook-widget)"}[2]}" != $'\t'$histchars[3]' undefined' ]];
+then
   (( zsh_highlight_use_redrawhook=1 ))
 fi
 
@@ -364,7 +366,9 @@ _zsh_highlight_bind_widgets()
 
 if (( $zsh_highlight_use_redrawhook )); then
   _zsh_highlight_bind_widgets(){}
-  zle -N zle-line-pre-redraw _zsh_highlight
+  if [[ -o zle ]]; then
+    add-zle-hook-widget zle-line-pre-redraw _zsh_highlight
+  fi
 fi
 
 # Load highlighters from directory.