diff --git a/src/uncategorized/nonRandomEvent.tw b/src/uncategorized/nonRandomEvent.tw
index da9615cdfed77671a1bb35df58bfe4ea454500c2..c9823fe6ea2cd16440bb7c0560904e7639c4490b 100644
--- a/src/uncategorized/nonRandomEvent.tw
+++ b/src/uncategorized/nonRandomEvent.tw
@@ -160,10 +160,8 @@
 	<<goto "secExpSmilingMan">>
 <<elseif (_effectiveWeek > 84) && (random(1,100) > 66) && ($securityForceCreate == 1) && ($SFMODToggle == 1) && $OverallTradeShowAttendance == 0>>>
 	<<goto "securityForceTradeShow">>
-	<<set _TradeShowWeek = _effectiveWeek>>
-<<elseif _TradeShowWeek = 24 && (random(1,100) > 66) && ($securityForceCreate == 1) && ($SFMODToggle == 1) && $OverallTradeShowAttendance >= 1>>>
+<<elseif (Math.trunc($week/24) == ($week/24)) && (random(1,100) > 66) && ($securityForceCreate == 1) && ($SFMODToggle == 1) && $OverallTradeShowAttendance >= 1>>>
 	<<goto "securityForceTradeShow">>
-	<<set _TradeShowWeek = 0>>
 <<else>>
 	<<if random(1,100) > _effectiveWeek+25>>
 		<<goto "RIE Eligibility Check">>