diff --git a/monocles_chat.doap b/monocles_chat.doap
index 9931503fa..c1ea9a2e4 100644
--- a/monocles_chat.doap
+++ b/monocles_chat.doap
@@ -63,6 +63,15 @@
     <implements rdf:resource="https://xmpp.org/rfcs/rfc7590.html"/>
 
 
+
+	<implements>
+		<xmpp:SupportedXep>
+			<xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0224.html"/>
+			<xmpp:status>partial</xmpp:status>
+			<xmpp:version>1.0</xmpp:version>
+			<xmpp:note xml:lang='en'>For MUC members</xmpp:note>
+		</xmpp:SupportedXep>
+	</implements>
 	<implements>
 		<xmpp:SupportedXep>
 			<xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0428.html"/>
diff --git a/src/main/java/de/monocles/chat/ConnectionService.java b/src/main/java/de/monocles/chat/ConnectionService.java
index 150708a33..2fc8c12ff 100644
--- a/src/main/java/de/monocles/chat/ConnectionService.java
+++ b/src/main/java/de/monocles/chat/ConnectionService.java
@@ -300,7 +300,7 @@ public class ConnectionService extends android.telecom.ConnectionService {
         @Override
         public void onCallAudioStateChanged(CallAudioState state) {
             pendingState = null;
-            if (rtpConnection == null || rtpConnection.get() == null) {
+            if (rtpConnection == null || rtpConnection.get() == null || rtpConnection.get().getAudioManager() == null) {
                 pendingState = state;
                 return;
             }