diff --git a/host_state_manager.cpp b/host_state_manager.cpp
index bec0f0a..f1709cd 100644
--- a/host_state_manager.cpp
+++ b/host_state_manager.cpp
@@ -127,6 +127,7 @@
          fmt::format("obmc-host-reboot@{}.target", id)}
     };
 #endif
+    hostCrashTarget = fmt::format("obmc-host-crash@{}.target", id);
 }
 
 const std::string& Host::getTarget(HostState state)
@@ -352,6 +353,20 @@
         info("Received signal that host is in diagnostice mode");
         this->currentHostState(server::Host::HostState::DiagnosticMode);
     }
+    else if ((newStateUnit == hostCrashTarget) &&
+             (server::Host::currentHostState() ==
+              server::Host::HostState::Running))
+    {
+        // Only decrease the boot count if host was running when the host crash
+        // target was started. Systemd will sometimes trigger multiple
+        // JobNew events for the same target. This seems to be related to
+        // how OpenBMC utilizes the targets in the reboot scenario
+        info("Received signal that host has crashed, decrement reboot count");
+
+        // A host crash can cause a reboot of the host so decrement the reboot
+        // count
+        decrementRebootCount();
+    }
 }
 
 uint32_t Host::decrementRebootCount()