diff --git a/bin/exec-env b/bin/exec-env
index 7fb0d6b..b888d6e 100755
--- a/bin/exec-env
+++ b/bin/exec-env
@@ -1,9 +1,11 @@
 #!/usr/bin/env bash
 
-if [ "$GOROOT" = "" ] ; then
-    export GOROOT=$ASDF_INSTALL_PATH/go
-fi
-
-if [ "$GOPATH" = "" ] ; then
-    export GOPATH=$ASDF_INSTALL_PATH/packages
+if [ "${ASDF_INSTALL_VERSION}" != 'system' ] ; then
+	if [ "$GOROOT" = "" ] ; then
+	    export GOROOT=$ASDF_INSTALL_PATH/go
+	fi
+	
+	if [ "$GOPATH" = "" ] ; then
+	    export GOPATH=$ASDF_INSTALL_PATH/packages
+	fi
 fi