diff --git a/site-modules/core/files/zshrc b/site-modules/core/files/zshrc
index 364f9ce..fd713b0 100644
--- a/site-modules/core/files/zshrc
+++ b/site-modules/core/files/zshrc
@@ -76,7 +76,10 @@ export PATH=$PATH:$HOME/.config/composer/vendor/bin
 #
 # Set up golang
 #
-export GOPATH=$HOME/go
+if [ -d $HOME/go ]; then
+    export GOPATH=$HOME/go
+    export PATH=$PATH:$GOPATH/bin
+fi
 
 #
 # Init oh-my-zsh