diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index 24f2a2ed7..35fc913da 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -193,7 +193,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
 	}
 
 	public boolean setOutgoingChatState(ChatState state) {
-		if (mode == MODE_MULTI && getNextCounterpart() != null) {
+		if (mode == MODE_MULTI && (getNextCounterpart() != null || !isPnNA())) {
 			return false;
 		}
 		if (this.mOutgoingChatState != state) {