diff --git a/src/script_opt/ZAM/OPs/stmts.op b/src/script_opt/ZAM/OPs/stmts.op
index 3ed308551e..0401b7f9c6 100644
--- a/src/script_opt/ZAM/OPs/stmts.op
+++ b/src/script_opt/ZAM/OPs/stmts.op
@@ -36,7 +36,9 @@ op-types D I X
 op1-read
 eval	EvalScheduleArgs($1, $2,)
 
-macro QueueEvent(eh, args) event_mgr.Enqueue(eh, std::move(args));
+macro QueueEvent(eh, args)
+	if ( *eh )
+		event_mgr.Enqueue(eh, std::move(args));
 
 op Event
 class HL
diff --git a/testing/btest/Baseline.zam/opt.validate-ZAM/output b/testing/btest/Baseline.zam/opt.validate-ZAM/output
index e1c24ab2aa..91340e747c 100644
--- a/testing/btest/Baseline.zam/opt.validate-ZAM/output
+++ b/testing/btest/Baseline.zam/opt.validate-ZAM/output
@@ -1,2 +1,2 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-1226 valid, 1834 tested, 423 skipped
+1227 valid, 1834 tested, 423 skipped