diff --git a/library/GTP_Emulation.ttcn b/library/GTP_Emulation.ttcn
index 534fdef..615309a 100644
--- a/library/GTP_Emulation.ttcn
+++ b/library/GTP_Emulation.ttcn
@@ -185,10 +185,19 @@
 		var template hexstring imsi_t := f_gtpc_extract_imsi(g1c_ud.gtpc);
 		if (isvalue(imsi_t)) {
 			vc_conn := f_comp_by_imsi(valueof(imsi_t));
-		} else {
+			CLIENT.send(g1c_ud) to vc_conn;
+		} else if(g1c_ud.gtpc.teid != int2oct(0, 4)) {
 			vc_conn := f_comp_by_teid(g1c_ud.gtpc.teid);
+			CLIENT.send(g1c_ud) to vc_conn;
+		} else {
+			/* Send to all clients */
+			var integer i;
+			for (i := 0; i < sizeof(TidTable); i := i+1) {
+				if (isbound(TidTable[i].teid) and TidTable[i].teid == teid) {
+					CLIENT.send(g1c_ud) to TidTable[i].vc_conn;
+				}
+			}
 		}
-		CLIENT.send(g1c_ud) to vc_conn;
 		}
 	[] GTPU.receive(Gtp1uUnitdata:?) -> value g1u_ud {
 		vc_conn := f_comp_by_teid(g1u_ud.gtpu.teid);