diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 336b2a19d..b0991fd76 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -2163,7 +2163,7 @@ static void linphone_core_internal_notify_received(LinphoneCore *lc, LinphoneEve
 }
 
 static void _linphone_core_conference_subscribe_received(LinphoneCore *lc, LinphoneEvent *lev, const LinphoneContent *body) {
-	if (body && strcasecmp(linphone_content_get_custom_header(body, "Content-Disposition"), "recipient-list") == 0) {
+	if (body && linphone_content_get_custom_header(body, "Content-Disposition") && strcasecmp(linphone_content_get_custom_header(body, "Content-Disposition"), "recipient-list") == 0) {
 		// List subscription
 		L_GET_PRIVATE_FROM_C_OBJECT(lc)->localListEventHandler->subscribeReceived(lev, body);
 		return;
diff --git a/src/conference/handlers/remote-conference-list-event-handler.cpp b/src/conference/handlers/remote-conference-list-event-handler.cpp
index 864e6f961..011bedaef 100644
--- a/src/conference/handlers/remote-conference-list-event-handler.cpp
+++ b/src/conference/handlers/remote-conference-list-event-handler.cpp
@@ -65,6 +65,9 @@ void RemoteConferenceListEventHandler::subscribe () {
 	if (lev)
 		return;
 
+	if (handlers.size() == 0)
+		return;
+
 	Content content;
 	content.setContentType(ContentType::ResourceLists);