diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index f292f6c47..ef3b67dac 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -2637,6 +2637,9 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
         } else if (mode == Conversation.MODE_SINGLE
                 && conversation.smpRequested()) {
             showSnackbar(R.string.smp_requested, R.string.verify, this.mAnswerSmpClickListener);
+        } else if (mode == Conversation.MODE_SINGLE
+                && conversation.getNextEncryption() == Message.ENCRYPTION_OTR) {
+            showSnackbar(R.string.otr_warning, R.string.readmore, OTRwarning);
         } else if (mode == Conversation.MODE_SINGLE
                 && conversation.hasValidOtrSession()
                 && (conversation.getOtrSession().getSessionStatus() == SessionStatus.ENCRYPTED)
@@ -2660,8 +2663,6 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
             } else {
                 hideSnackbar();
             }
-        } else if (conversation.getNextEncryption() == Message.ENCRYPTION_OTR) {
-            showSnackbar(R.string.otr_warning, R.string.readmore, OTRwarning);
         } else {
             hideSnackbar();
         }