diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0fad5c10f1..551cfd2636 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,9 +53,7 @@ else()
 endif()
 
 # Use default time server if none defined in environment
-if (NOT DEFINED TIMESERVER_URL)
-  set(TIMESERVER_URL "http://sha256timestamp.ws.symantec.com/sha256/timestamp")
-endif()
+set_from_env(TIMESERVER_URL TIMESERVER_URL "http://sha256timestamp.ws.symantec.com/sha256/timestamp")
 
 set(HIFI_USE_OPTIMIZED_IK OFF)
 set(BUILD_CLIENT_OPTION ON)