diff --git a/edksetup.sh b/edksetup.sh
index cab3a8c113..0ae32ea8cc 100755
--- a/edksetup.sh
+++ b/edksetup.sh
@@ -103,14 +103,22 @@ SetupEnv()
   fi
 }
 
-SetupPython3()
+SetupPythonCommand()
 {
+  #
+  # If PYTHON_COMMAND is already set, then we can return right now
+  #
+  if [ -n "$PYTHON_COMMAND" ]
+  then
+    return 0
+  fi
+
   export PYTHON_COMMAND=python3
 }
 
 SourceEnv()
 {
-  SetupPython3
+  SetupPythonCommand
   SetWorkspace
   SetupEnv
 }