diff --git a/inc/message.h b/inc/message.h
index 5eef43a..23f6a87 100644
--- a/inc/message.h
+++ b/inc/message.h
@@ -61,7 +61,8 @@ CR_DECLARE_SCOPED_ENUM (StatusIconCache,
    Escape = cr::bit (2),
    Rescue = cr::bit (3),
    VipSafety = cr::bit (4),
-   C4 = cr::bit (5)
+   C4 = cr::bit (5),
+   Defuser = cr::bit (6)
 )
 
 class MessageDispatcher final : public Singleton <MessageDispatcher> {
diff --git a/src/message.cpp b/src/message.cpp
index c9cf39c..acee734 100644
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -267,6 +267,9 @@ void MessageDispatcher::netMsgStatusIcon () {
    else if (cached & StatusIconCache::C4) {
       m_bot->m_inBombZone = (m_args[enabled].long_ == 2);
    }
+   else if (cached && StatusIconCache::Defuser) {
+      m_bot->m_hasDefuser = (m_args[enabled].long_ != 0);
+   }
 }
 
 void MessageDispatcher::netMsgDeathMsg () {
@@ -501,6 +504,7 @@ MessageDispatcher::MessageDispatcher () {
    m_statusIconCache["rescue"] = StatusIconCache::NeedHandle | StatusIconCache::Rescue;
    m_statusIconCache["vipsafety"] = StatusIconCache::NeedHandle | StatusIconCache::VipSafety;
    m_statusIconCache["c4"] = StatusIconCache::NeedHandle | StatusIconCache::C4;
+   m_statusIconCache["defuser"] = StatusIconCache::NeedHandle | StatusIconCache::Defuser;
 
    // register team info cache
    m_teamInfoCache["TERRORIST"] = Team::Terrorist;