diff --git a/Strategic/Game Event Hook.cpp b/Strategic/Game Event Hook.cpp
index 9edde3e6..ce199e1c 100644
--- a/Strategic/Game Event Hook.cpp	
+++ b/Strategic/Game Event Hook.cpp	
@@ -525,7 +525,9 @@ BOOLEAN ExecuteStrategicEvent( STRATEGICEVENT *pEvent )
 		case EVENT_PMC_REINFORCEMENT_ARRIVAL:
 			HandlePMCArrival( (UINT8)pEvent->uiParam );
 			break;
-
+#ifdef JA2UB
+		// No Kingpin Events in UB
+#else
 		case EVENT_KINGPIN_BOUNTY_INITIAL:
 			// if Kingpin, Angel and Maria are still alive, we can start the quest
 			if ( gMercProfiles[KINGPIN].bMercStatus != MERC_IS_DEAD && !CheckFact( FACT_KINGPIN_DEAD, NO_PROFILE ) && !CheckFact( FACT_KINGPIN_IS_ENEMY, NO_PROFILE ) && 
@@ -571,6 +573,7 @@ BOOLEAN ExecuteStrategicEvent( STRATEGICEVENT *pEvent )
 			EndQuest( QUEST_KINGPIN_ANGEL_MARIA, gWorldSectorX, gWorldSectorY );
 
 			break;
+	#endif
 	}
 	gfPreventDeletionOfAnyEvent = fOrigPreventFlag;
 	return TRUE;
diff --git a/Tactical/Overhead.cpp b/Tactical/Overhead.cpp
index 9a594bd2..a135420b 100644
--- a/Tactical/Overhead.cpp
+++ b/Tactical/Overhead.cpp
@@ -3841,6 +3841,8 @@ void HandleNPCTeamMemberDeath( SOLDIERTYPE *pSoldierOld )
 			}
 		}
 
+#ifdef JA2UB
+#else
 		// if Angel an Maria are dead and the bounty hunter quest is still ongoing, then finish it
 		if ( gubQuest[QUEST_KINGPIN_ANGEL_MARIA] == QUESTINPROGRESS )
 		{
@@ -3854,6 +3856,8 @@ void HandleNPCTeamMemberDeath( SOLDIERTYPE *pSoldierOld )
 				DeleteStrategicEvent( EVENT_KINGPIN_BOUNTY_END_TIME_PASSED, 0 );
 			}
 		}
+#endif
+
     }
     else if ( pSoldierOld->bTeam == MILITIA_TEAM )
     {