diff --git a/dotfiles/ssh/config b/dotfiles/ssh/config
index d3766d2..7bc96d9 100644
--- a/dotfiles/ssh/config
+++ b/dotfiles/ssh/config
@@ -10,6 +10,6 @@ Include config.d/*/*.config
 {%@@ if profile == 'susanoo.local' or profile == 'WVDEWOBMC001307' @@%}#
 # This have to be LAST
 #
-Host *
+Match host * exec "[[ -z $SSH_CLIENT && -z $SSH_TTY ]]"
    IdentityAgent "~/Library/Group Containers/group.strongbox.mac.mcguill/agent.sock"
 {%@@ endif @@%}