diff --git a/src/main/java/eu/siacs/conversations/crypto/sasl/DigestMd5.java b/src/main/java/eu/siacs/conversations/crypto/sasl/DigestMd5.java
index 55c38f409..8b16215bd 100644
--- a/src/main/java/eu/siacs/conversations/crypto/sasl/DigestMd5.java
+++ b/src/main/java/eu/siacs/conversations/crypto/sasl/DigestMd5.java
@@ -79,6 +79,10 @@ public class DigestMd5 extends SaslMechanism {
 			case RESPONSE_SENT:
 				state = State.VALID_SERVER_RESPONSE;
 				break;
+			case VALID_SERVER_RESPONSE:
+				if (challenge==null) {
+					return null; //everything is fine
+				}
 			default:
 				throw new InvalidStateException(state);
 		}