diff --git a/Tactical/Interface Items.cpp b/Tactical/Interface Items.cpp
index 34c7af02..7e3a0efd 100644
--- a/Tactical/Interface Items.cpp	
+++ b/Tactical/Interface Items.cpp	
@@ -13972,8 +13972,8 @@ void BombInventoryDisArmMessageBoxCallBack( UINT8 ubExitValue )
 			if ( (*gpItemDescObject).fFlags & OBJECT_ARMED_BOMB )
 				gpItemDescObject->fFlags &= ~( OBJECT_ARMED_BOMB );
 
-			if ( (*gpItemDescObject).fFlags & OBJECT_KNOWN_TO_BE_TRAPPED )
-				gpItemDescObject->fFlags &= ~( OBJECT_KNOWN_TO_BE_TRAPPED );
+			/*if ( (*gpItemDescObject).fFlags & OBJECT_KNOWN_TO_BE_TRAPPED )
+				gpItemDescObject->fFlags &= ~( OBJECT_KNOWN_TO_BE_TRAPPED );*/
 		}
 		else
 		{
diff --git a/Tactical/Items.cpp b/Tactical/Items.cpp
index d02b36d7..e3c58c35 100644
--- a/Tactical/Items.cpp
+++ b/Tactical/Items.cpp
@@ -8338,6 +8338,7 @@ BOOLEAN ArmBomb( OBJECTTYPE * pObj, INT8 bSetting )
 		(*pObj).fFlags &= ~(OBJECT_DISABLED_BOMB);
 
 	(*pObj).fFlags |= OBJECT_ARMED_BOMB;
+	(*pObj).fFlags |= OBJECT_KNOWN_TO_BE_TRAPPED;
 	(*pObj)[0]->data.misc.usBombItem = pObj->usItem;
 	return( TRUE );
 }