diff --git a/host_state_manager.cpp b/host_state_manager.cpp
index ed083c2..1a0d188 100644
--- a/host_state_manager.cpp
+++ b/host_state_manager.cpp
@@ -66,8 +66,15 @@
     {server::Host::Transition::Off, HOST_STATE_SOFT_POWEROFF_TGT},
     {server::Host::Transition::On, HOST_STATE_POWERON_TGT},
     {server::Host::Transition::Reboot, HOST_STATE_REBOOT_TGT},
+// Some systems do not support a warm reboot so just map the reboot
+// requests to our normal cold reboot in that case
+#if ENABLE_WARM_REBOOT
     {server::Host::Transition::GracefulWarmReboot, HOST_STATE_WARM_REBOOT},
     {server::Host::Transition::ForceWarmReboot, HOST_STATE_FORCE_WARM_REBOOT}};
+#else
+    {server::Host::Transition::GracefulWarmReboot, HOST_STATE_REBOOT_TGT},
+    {server::Host::Transition::ForceWarmReboot, HOST_STATE_REBOOT_TGT}};
+#endif
 
 constexpr auto SYSTEMD_SERVICE = "org.freedesktop.systemd1";
 constexpr auto SYSTEMD_OBJ_PATH = "/org/freedesktop/systemd1";
diff --git a/meson.build b/meson.build
index a517f77..610b4ba 100644
--- a/meson.build
+++ b/meson.build
@@ -42,6 +42,10 @@
 
 configure_file(output: 'config.h', configuration: conf)
 
+if(get_option('warm-reboot').enabled())
+    add_project_arguments('-DENABLE_WARM_REBOOT',language:'cpp')
+endif
+
 sdbusplus = dependency('sdbusplus')
 sdeventplus = dependency('sdeventplus')
 phosphorlogging = dependency('phosphor-logging')
diff --git a/meson_options.txt b/meson_options.txt
index 385323d..9412421 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -83,3 +83,8 @@
     value: 'xyz.openbmc_project.State.ScheduledHostTransition',
     description: 'The scheduled host transition Dbus busname to own.',
 )
+
+option('warm-reboot', type : 'feature',
+    value : 'enabled',
+    description : 'Enable warm reboots of the system',
+)