diff --git a/cmake/Version.cmake b/cmake/Version.cmake
index 6fa32e9c73..d15d5b9f86 100644
--- a/cmake/Version.cmake
+++ b/cmake/Version.cmake
@@ -12,12 +12,12 @@ set(LY_VERSION_STRING "0.0.0.0" CACHE STRING "Open 3D Engine's version")
 set(LY_VERSION_BUILD_NUMBER 0 CACHE STRING "Open 3D Engine's build number")
 set(LY_VERSION_ENGINE_NAME "o3de" CACHE STRING "Open 3D Engine's engine name")
 
-if(DEFINED ENV{O3DE_VERSION})
+if("$ENV{O3DE_VERSION}" VERSION_GREATER "0.0.0.0")
     # Overriding through environment
     set(LY_VERSION_STRING "$ENV{O3DE_VERSION}")
 endif()
 
-if(DEFINED ENV{O3DE_BUILD_VERSION})
+if("$ENV{O3DE_BUILD_VERSION}" GREATER 0)
     # Overriding through environment
     set(LY_VERSION_BUILD_NUMBER "$ENV{O3DE_BUILD_VERSION}")
 endif()