diff --git a/CMakeLists.txt b/CMakeLists.txt
index 637e0f285ec0..c40216cd3089 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,12 +70,10 @@ include(GNUInstallDirs)
 include(FetchContent)
 include(CMakePrintHelpers)
 
-if(EXISTS "${QGC_CPM_SOURCE_CACHE}")
-    set(ENV{CPM_SOURCE_CACHE} "${QGC_CPM_SOURCE_CACHE}")
-else()
-    set(ENV{CPM_SOURCE_CACHE} "${CMAKE_BINARY_DIR}/cpm_modules")
-endif()
 include(CPM)
+if(NOT CPM_SOURCE_CACHE)
+    set(CPM_SOURCE_CACHE "${CMAKE_BINARY_DIR}/cpm_modules")
+endif()
 
 include(Toolchain)
 
diff --git a/cmake/CustomOptions.cmake b/cmake/CustomOptions.cmake
index 0e86a25c66c1..39d3bdf4f5f6 100644
--- a/cmake/CustomOptions.cmake
+++ b/cmake/CustomOptions.cmake
@@ -85,7 +85,6 @@ set(QGC_WINDOWS_ICON_PATH "${CMAKE_SOURCE_DIR}/deploy/windows/WindowsQGC.ico" CA
 set(QGC_WINDOWS_RESOURCE_FILE_PATH "${CMAKE_SOURCE_DIR}/deploy/windows/QGroundControl.rc" CACHE FILEPATH "Windows Resource File Path")
 
 # CPM
-set(QGC_CPM_SOURCE_CACHE "" CACHE PATH "Directory to Download CPM Dependencies, Overrides CPM_SOURCE_CACHE Env Variable")
 # set(CPM_USE_NAMED_CACHE_DIRECTORIES ON CACHE BOOL "Use additional directory of package name in cache on the most nested level.")
 
 # Qt
diff --git a/cmake/PrintSummary.cmake b/cmake/PrintSummary.cmake
index 02d0803dfdad..276494bd759f 100644
--- a/cmake/PrintSummary.cmake
+++ b/cmake/PrintSummary.cmake
@@ -86,7 +86,7 @@ message(STATUS "----------------------------------------------------------------
 message(STATUS "-- External Dependencies -------------------------------------------")
 message(STATUS "MAVLink repo URL:     ${QGC_MAVLINK_GIT_REPO}")
 message(STATUS "MAVLink repo tag:     ${QGC_MAVLINK_GIT_TAG}")
-message(STATUS "CPM cache directory:  ${QGC_CPM_SOURCE_CACHE}")
+message(STATUS "CPM cache directory:  ${CPM_SOURCE_CACHE}")
 message(STATUS "QML output directory: ${QT_QML_OUTPUT_DIRECTORY}")
 message(STATUS "------------------------------------------------------------------")