diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m
index 1fc516ee6..b8d600512 100644
--- a/Classes/LinphoneManager.m
+++ b/Classes/LinphoneManager.m
@@ -1355,7 +1355,9 @@ static void linphone_iphone_call_encryption_changed(LinphoneCore *lc, LinphoneCa
 	NSMutableDictionary *dict = [NSMutableDictionary dictionary];
 	[dict setObject:[NSValue valueWithPointer:call] forKey:@"call"];
 	[dict setObject:[NSNumber numberWithBool:on] forKey:@"on"];
-	[dict setObject:[NSString stringWithUTF8String:authentication_token] forKey:@"token"];
+	if (authentication_token) {
+		[dict setObject:[NSString stringWithUTF8String:authentication_token] forKey:@"token"];
+	}
 	[NSNotificationCenter.defaultCenter postNotificationName:kLinphoneCallEncryptionChanged object:self userInfo:dict];
 }
 
diff --git a/submodules/bctoolbox b/submodules/bctoolbox
index 058967d34..7254fe94e 160000
--- a/submodules/bctoolbox
+++ b/submodules/bctoolbox
@@ -1 +1 @@
-Subproject commit 058967d340a97d7a4c155490398162b24c2ea399
+Subproject commit 7254fe94e7155f0164fca177f8bf54ab82b76e84