diff --git a/library/MNCC_Emulation.ttcn b/library/MNCC_Emulation.ttcn
index 4bf516d..de29288 100644
--- a/library/MNCC_Emulation.ttcn
+++ b/library/MNCC_Emulation.ttcn
@@ -280,6 +280,14 @@
 			f_call_table_del(call_id);
 			}
 
+		/* Client -> MNCC Socket: SETUP.req: forward + add call table entry */
+		[] MNCC_CLIENT.receive(MNCC_PDU:{msg_type := MNCC_SETUP_REQ, u:=?}) -> value mncc sender vc_conn {
+			/* add to call table */
+			f_call_table_add(vc_conn, f_mncc_get_call_id(mncc));
+			/* forward to MNCC socket */
+			MNCC.send(t_SD_MNCC(g_mncc_ud_id, mncc));
+			}
+
 		/* Client -> MNCC Socket: Normal message */
 		[] MNCC_CLIENT.receive(MNCC_PDU:?) -> value mncc sender vc_conn {
 			/* forward to MNCC socket */