diff --git a/82-completion.zsh b/82-completion.zsh
index 4c73075..66be54a 100644
--- a/82-completion.zsh
+++ b/82-completion.zsh
@@ -43,6 +43,7 @@ zinit wait'1' lucid light-mode depth'1' for \
 	  zsh-users/zsh-history-substring-search
 
 [ "$(lsb_release -c -s)" = "orel" ] && ZSH_HISTORY_SEARCH_MULTI_WORD_MODE=1
+[ -n "${SSH_CONNECTION}" ] && ZSH_HISTORY_SEARCH_MULTI_WORD_MODE=2
 
 zstyle ':history-search-multi-word' page-size "$((LINES/2))"
 zstyle ':plugin:history-search-multi-word' clear-on-cancel 'yes'
@@ -50,9 +51,12 @@ if [[ -z ${ZSH_HISTORY_SEARCH_MULTI_WORD_MODE+set} ]]; then
 	zinit wait'1' lucid light-mode depth'1' for \
 		atload"bindkey '^K' history-search-multi-word" \
 		  zdharma-continuum/history-search-multi-word
-else
+elif [ ${ZSH_HISTORY_SEARCH_MULTI_WORD_MODE} = "1" ]; then
 	zinit wait'2' lucid light-mode depth'1' for \
 		atload"bindkey '^K' history-search-multi-word" \
 		  zdharma-continuum/history-search-multi-word
+elif [ ${ZSH_HISTORY_SEARCH_MULTI_WORD_MODE} = "2" ]; then
+	zinit light zdharma-continuum/history-search-multi-word
+	bindkey '^K' history-search-multi-word
 fi