diff --git a/cmake/SmithBasics.cmake b/cmake/SmithBasics.cmake
index 1d44bdca5..dbd196f9b 100644
--- a/cmake/SmithBasics.cmake
+++ b/cmake/SmithBasics.cmake
@@ -37,7 +37,14 @@ if (NOT SMITH_BASICS_SETUP)
     cmake_dependent_option(SMITH_ENABLE_MPI "Enables Smith with MPI support" ON "ENABLE_MPI" OFF)
     cmake_dependent_option(SMITH_ENABLE_OPENMP "Enables Smith with OPENMP support" ON "ENABLE_OPENMP" OFF)
 
+    # Options for builtin TPLs
     option(SMITH_ENABLE_GRETL "Enables Smith with Gretl Support" ON)
+    option(SMITH_ENABLE_CONTINUATION "Enables Smith with Continuation Solver support" ON)
+
+    if (SMITH_ENABLE_HIP OR SMITH_ENABLE_CUDA)
+        message(STATUS "Disabling Smith's Continuation Solver support due to currently non-supported GPU build")
+        set(SMITH_ENABLE_CONTINUATION FALSE CACHE BOOL "" FORCE)
+    endif()
 
     #------------------------------------------------------------------------------
     # Profiling options
diff --git a/cmake/thirdparty/SetupSmithThirdParty.cmake b/cmake/thirdparty/SetupSmithThirdParty.cmake
index 5fb11987a..02d45ea8d 100644
--- a/cmake/thirdparty/SetupSmithThirdParty.cmake
+++ b/cmake/thirdparty/SetupSmithThirdParty.cmake
@@ -45,10 +45,8 @@ if (NOT SMITH_THIRD_PARTY_LIBRARIES_FOUND)
         # Can be removed once this BLT PR is merged https://github.com/LLNL/blt/pull/585 (?)
         find_package(CUDAToolkit REQUIRED)
         set(smith_device_depends blt::cuda CUDA::cublasLt CACHE STRING "" FORCE)
-        set(SMITH_ENABLE_CONTINUATION FALSE)
     elseif(SMITH_ENABLE_HIP)
         set(smith_device_depends blt::hip CACHE STRING "" FORCE)
-        set(SMITH_ENABLE_CONTINUATION FALSE)
     else()
         set(smith_device_depends "" CACHE STRING "" FORCE)
     endif()
@@ -417,9 +415,6 @@ if (NOT SMITH_THIRD_PARTY_LIBRARIES_FOUND)
     #------------------------------------------------------------------------------
     # ContinuationSolvers
     #------------------------------------------------------------------------------
-    if (NOT DEFINED SMITH_ENABLE_CONTINUATION)
-        set(SMITH_ENABLE_CONTINUATION ON)
-    endif()
     message(STATUS "Smith Enable Continuation: ${SMITH_ENABLE_CONTINUATION}")
     
     if(SMITH_ENABLE_CONTINUATION)