diff --git a/src/App/Pages/Vault/VaultAutofillListLoginsPage.cs b/src/App/Pages/Vault/VaultAutofillListLoginsPage.cs
index 72caa5918..2fb9b62e7 100644
--- a/src/App/Pages/Vault/VaultAutofillListLoginsPage.cs
+++ b/src/App/Pages/Vault/VaultAutofillListLoginsPage.cs
@@ -31,13 +31,14 @@ namespace Bit.App.Pages
 
             Uri uri;
             DomainName domainName;
-            if(!System.Uri.TryCreate(uriString, UriKind.Absolute, out uri) ||
+            if(uriString?.StartsWith(Constants.AndroidAppProtocol) ?? false)
+            {
+                _name = uriString.Substring(Constants.AndroidAppProtocol.Length);
+            }
+            else if(!System.Uri.TryCreate(uriString, UriKind.Absolute, out uri) ||
                 !DomainName.TryParse(uri.Host, out domainName))
             {
-                if(uriString != null && uriString.StartsWith(Constants.AndroidAppProtocol))
-                {
-                    _name = uriString.Substring(Constants.AndroidAppProtocol.Length);
-                }
+                _name = "--";
             }
             else
             {