diff --git a/app/src/main/java/eu/faircode/email/UriHelper.java b/app/src/main/java/eu/faircode/email/UriHelper.java
index 0c1b730438..9a8fc50f38 100644
--- a/app/src/main/java/eu/faircode/email/UriHelper.java
+++ b/app/src/main/java/eu/faircode/email/UriHelper.java
@@ -433,17 +433,15 @@ public class UriHelper {
                 for (String value : url.getQueryParameters(key)) {
                     Log.i("Query " + key + "=" + value);
 
-                    if (clean != null && clean.contains(key))
-                        changed = true;
-
-                    if (!changed) {
+                    if (clean == null || !clean.contains(key)) {
                         Uri suri = Uri.parse(value);
                         if (suri != null && isHyperLink(suri)) {
                             Uri s = sanitize(context, suri);
                             return (s == null ? suri : s);
                         }
                         builder.appendQueryParameter(key, value);
-                    }
+                    } else
+                        changed = true;
                 }
             first = false;
         }