diff --git a/tmux.conf b/tmux.conf
index 8314694..f3207d5 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -33,12 +33,11 @@ bind -n C-j if "$is_vim" 'send-keys C-j' 'select-pane -D'
 bind -n C-k if "$is_vim" 'send-keys C-k' 'select-pane -U'
 bind -n C-l if "$is_vim" 'send-keys C-l' 'select-pane -R'
 
-# TODO: needs update for tmux v2.4
-bind -t vi-copy Escape cancel
-bind -t vi-copy y      copy-selection
-bind -t vi-copy v      begin-selection
-bind -t vi-copy q      clear-selection
-bind -t vi-copy C-v    rectangle-toggle
+bind -T copy-mode-vi Escape send -X cancel
+bind -T copy-mode-vi y      send -X copy-selection
+bind -T copy-mode-vi v      send -X begin-selection
+bind -T copy-mode-vi q      send -X clear-selection
+bind -T copy-mode-vi C-v    send -X rectangle-toggle
 
 # mouse
 set -g mouse on