diff --git a/library/Osmocom_Types.ttcn b/library/Osmocom_Types.ttcn
index fa3688101..628128038 100644
--- a/library/Osmocom_Types.ttcn
+++ b/library/Osmocom_Types.ttcn
@@ -216,7 +216,7 @@ function f_rnd_ra_cs() return OCT1 {
 	var OCT1 ra;
 	do {
 		ra := f_rnd_octstring(1);
-	} while (ra_is_ps(ra));
+	} while (ra_is_ps(ra) or ra_is_emerg(ra));
 	return ra;
 }