diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 62fb83b989c58c61779323b815bb66069726ea9d..e6059c322b88c7df81e3dfdd71f26a4e594d8064 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -4118,7 +4118,16 @@ module OneM2M_Functions {
 				var ResponsePrimitive v_response;
 				
 			 	[] mcaPortIn.receive(mw_request(mw_notify)) -> value v_request {
-					log(__SCOPE__&": WARNING: Unexpected NOTIFY message received");
+					log(__SCOPE__&": WARNING: Unexpected NOTIFY (single notification) message received");
+
+					//Send response in any case
+					v_response := valueof(m_responseNotification(int2000, omit));
+					v_response.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
+					f_send(e_mca_in_port, m_response(v_response));
+					repeat;
+				}
+				[] mcaPortIn.receive(mw_request(mw_notifyAggregatedNotification)) -> value v_request {
+					log(__SCOPE__&": WARNING: Unexpected NOTIFY (aggregated notification) message received");
 
 					//Send response in any case
 					v_response := valueof(m_responseNotification(int2000, omit));