diff --git a/stowed-files/tmux/.config/tmux/tmux.conf b/stowed-files/tmux/.config/tmux/tmux.conf
index 318cf2c..e458394 100644
--- a/stowed-files/tmux/.config/tmux/tmux.conf
+++ b/stowed-files/tmux/.config/tmux/tmux.conf
@@ -157,6 +157,9 @@ if-shell 'test -z "${SSH_CONNECTION}"' {
 set-option -gaq status-right '%R'
 # }}}
 
+# Update when creating or attaching
+set-option -gq update-environment "SWAYSOCK SSH_AUTH_SOCK SSH_AGENT_PID"
+
 # Tweak some behaviors when using SSH
 if-shell 'test -n "${SSH_CONNECTION}"' {
   # Use a different prefix when using SSH in order to make nesting easier