diff --git a/Vector/AppDelegate.m b/Vector/AppDelegate.m
index 8609018fd..99ce68e5b 100644
--- a/Vector/AppDelegate.m
+++ b/Vector/AppDelegate.m
@@ -916,10 +916,13 @@
 
             // Get the parameter value
             NSString *value = [[keyValue componentsSeparatedByString:@"="] objectAtIndex:1];
-            value = [value stringByReplacingOccurrencesOfString:@"+" withString:@" "];
-            value = [value stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+            if (value.length)
+            {
+                value = [value stringByReplacingOccurrencesOfString:@"+" withString:@" "];
+                value = [value stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
 
-            queryParams[key] = value;
+                queryParams[key] = value;
+            }
         }
     }