diff --git a/src/eu/siacs/conversations/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java
index 0255fc049..1e703b48c 100644
--- a/src/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/eu/siacs/conversations/ui/ConversationFragment.java
@@ -805,10 +805,12 @@ public class ConversationFragment extends Fragment {
 
 				@Override
 				public void onClick(View v) {
-					AlertDialog dialog = UIHelper.getVerifyFingerprintDialog(
-							(ConversationActivity) getActivity(), conversation,
-							fingerprintWarning);
-					dialog.show();
+					if (conversation.getOtrFingerprint() != null) {
+						AlertDialog dialog = UIHelper.getVerifyFingerprintDialog(
+								(ConversationActivity) getActivity(), conversation,
+								fingerprintWarning);
+						dialog.show();
+					}
 				}
 			});
 		} else {