diff --git a/code/cgame/cg_predict_weapons.c b/code/cgame/cg_predict_weapons.c
index 1de49d2..8ed980a 100644
--- a/code/cgame/cg_predict_weapons.c
+++ b/code/cgame/cg_predict_weapons.c
@@ -1303,7 +1303,7 @@ static void CG_WeaponPredict_FirePredictedImod( const weaponPredictDirs_t *dirs,
 			CG_WeaponPredict_RunPredictedEvent( &tent, cg.predictedPlayerState.commandTime );
 		}
 
-		if ( tr.contents & CONTENTS_SOLID || tr.entityNum == ENTITYNUM_NONE ) {
+		if ( tr.contents & CONTENTS_SOLID || tr.entityNum == ENTITYNUM_NONE || tr.entityNum == ENTITYNUM_WORLD ) {
 			break;
 		}