diff --git a/Tools/CMake/AMReXConfig.cmake.in b/Tools/CMake/AMReXConfig.cmake.in
index 6b0cdd3fd74..64a112da181 100644
--- a/Tools/CMake/AMReXConfig.cmake.in
+++ b/Tools/CMake/AMReXConfig.cmake.in
@@ -223,10 +223,12 @@ endif ()
 # CUDA
 #
 # AMReX 21.06+ supports CUDA_ARCHITECTURES
-if(CMAKE_VERSION VERSION_LESS 3.20)
-   if (@AMReX_CUDA@)
-      include(AMReX_SetupCUDA)
-   endif ()
+if (@AMReX_CUDA@)
+    if (CMAKE_VERSION VERSION_LESS 3.20)
+        include(AMReX_SetupCUDA)
+    else ()
+        find_dependency(CUDAToolkit REQUIRED)
+    endif ()
 endif ()
 
 include( "${CMAKE_CURRENT_LIST_DIR}/AMReXTargets.cmake" )