diff --git a/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java b/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java
index eb7e2c3c6..466bc4098 100644
--- a/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java
@@ -91,6 +91,9 @@ public final class CryptoHelper {
 	}
 
 	public static String prettifyFingerprint(String fingerprint) {
+		if (fingerprint.length() < 40) {
+			return fingerprint;
+		}
 		StringBuilder builder = new StringBuilder(fingerprint);
 		builder.insert(8, " ");
 		builder.insert(17, " ");