diff --git a/CMakeLists.txt b/CMakeLists.txt
index 781209b..c05e5c4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,6 +11,7 @@
 
 option (YOCTO "Enable Building in Yocto" OFF)
 option (LIBPECI "Enable use of old peci driver API via libpeci" OFF)
+option (CRASHDUMP "Enable use of the Intel Crashdump service" OFF)
 
 if (LIBPECI AND NOT YOCTO)
     add_dependencies (host-error-monitor libpeci)
@@ -59,6 +60,10 @@
     target_link_libraries (host-error-monitor peci)
 endif ()
 
+if (CRASHDUMP)
+    add_definitions (-DCRASHDUMP)
+endif ()
+
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
 set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-rtti")
 
diff --git a/include/host_error_monitor.hpp b/include/host_error_monitor.hpp
index c28576f..3470c2f 100644
--- a/include/host_error_monitor.hpp
+++ b/include/host_error_monitor.hpp
@@ -68,6 +68,7 @@
     std::shared_ptr<sdbusplus::asio::connection> conn, bool recoverSystem,
     const std::string& triggerType)
 {
+#ifdef CRASHDUMP
     static bool recover;
     recover = recoverSystem;
     std::cerr << "Starting crashdump\n";
@@ -99,6 +100,7 @@
         },
         "com.intel.crashdump", "/com/intel/crashdump",
         "com.intel.crashdump.Stored", "GenerateStoredLog", triggerType);
+#endif
 }
 
 #ifdef LIBPECI