diff --git a/cmake/HandleGeneralOptions.cmake b/cmake/HandleGeneralOptions.cmake
index 0266cf3f0a..43659718b6 100644
--- a/cmake/HandleGeneralOptions.cmake
+++ b/cmake/HandleGeneralOptions.cmake
@@ -33,6 +33,7 @@ option(GTSAM_POSE3_EXPMAP                   "Enable/Disable using Pose3::EXPMAP
 option(GTSAM_ROT3_EXPMAP                    "Ignore if GTSAM_USE_QUATERNIONS is OFF (Rot3::EXPMAP by default). Otherwise, enable Rot3::EXPMAP, or if disabled, use Rot3::CAYLEY." ON)
 option(GTSAM_DT_MERGING                     "Enable/Disable merging of equal leaf nodes in DecisionTrees. This leads to significant speed up and memory savings." ON)
 option(GTSAM_ENABLE_TIMING                  "Enable the timing tools (gttic/gttoc)" OFF)
+option(GTSAM_HYBRID_TIMING                  "Enable the timing of hybrid factor graph machinery" OFF)
 option(GTSAM_ENABLE_CONSISTENCY_CHECKS      "Enable/Disable expensive consistency checks" OFF)
 option(GTSAM_ENABLE_MEMORY_SANITIZER        "Enable/Disable memory sanitizer" OFF)
 option(GTSAM_WITH_TBB                       "Use Intel Threaded Building Blocks (TBB) if available" ON)
diff --git a/gtsam/config.h.in b/gtsam/config.h.in
index 5d63624e73..58b93ee1ce 100644
--- a/gtsam/config.h.in
+++ b/gtsam/config.h.in
@@ -43,8 +43,7 @@
 #cmakedefine GTSAM_DT_MERGING
 
 // Whether to enable timing in hybrid factor graph machinery
-// #cmakedefine01 GTSAM_HYBRID_TIMING
-#define GTSAM_HYBRID_TIMING 1
+#cmakedefine01 GTSAM_HYBRID_TIMING
 
 // Whether we are using TBB (if TBB was found and GTSAM_WITH_TBB is enabled in CMake)
 #cmakedefine GTSAM_USE_TBB