diff --git a/library/BSSMAP_Emulation.ttcn b/library/BSSMAP_Emulation.ttcn
index 153fb86..8475d55 100644
--- a/library/BSSMAP_Emulation.ttcn
+++ b/library/BSSMAP_Emulation.ttcn
@@ -297,6 +297,7 @@
 
 	g_bssmap_id := id;
 	f_conn_table_init();
+	f_expect_table_init();
 
 	while (true) {
 		var BSSAP_N_UNITDATA_ind ud_ind;
@@ -518,5 +519,11 @@
 	setverdict(fail, "No space left in ExpectTable");
 }
 
+private function f_expect_table_init()
+runs on BSSMAP_Emulation_CT {
+	for (var integer i := 0; i < sizeof(ExpectTable); i := i+1) {
+		ExpectTable[i].l3_payload := omit;
+	}
+}
 
 }