diff --git a/app/src/main/java/eu/faircode/email/UriHelper.java b/app/src/main/java/eu/faircode/email/UriHelper.java
index 769ce7643c..a99f99d411 100644
--- a/app/src/main/java/eu/faircode/email/UriHelper.java
+++ b/app/src/main/java/eu/faircode/email/UriHelper.java
@@ -418,9 +418,9 @@ public class UriHelper {
         if (path != null)
             path = path.toLowerCase(Locale.ROOT);
 
-        boolean first = "www.facebook.com".equals(host);
         String q = url.getEncodedQuery();
-        if (q != null) {
+        if (!TextUtils.isEmpty(q)) {
+            boolean first = "www.facebook.com".equals(host);
             StringBuilder sb = new StringBuilder();
             for (String kv : q.split("&")) {
                 int eq = kv.indexOf('=');