diff --git a/conf.d/go.fish b/conf.d/go.fish
index c508b76..750e5b1 100644
--- a/conf.d/go.fish
+++ b/conf.d/go.fish
@@ -1,2 +1,4 @@
-set -gx GOPATH $HOME/.local/go
-fish_add_path $HOME/.local/go/bin
+if command -q go
+    set -gx GOPATH $HOME/.local/go
+    fish_add_path $HOME/.local/go/bin
+end