diff --git a/core/java/android/webkit/JWebCoreJavaBridge.java b/core/java/android/webkit/JWebCoreJavaBridge.java
index 7542e88367e24..5c0bd93251339 100644
--- a/core/java/android/webkit/JWebCoreJavaBridge.java
+++ b/core/java/android/webkit/JWebCoreJavaBridge.java
@@ -192,7 +192,8 @@ final class JWebCoreJavaBridge extends Handler {
     }
 
     private String getSignedPublicKey(int index, String challenge, String url) {
-        return Keystore.getInstance().generateKeyPair(index, challenge, url);
+        // generateKeyPair expects organizations which we don't have. Ignore url.
+        return Keystore.getInstance().generateKeyPair(index, challenge, null);
     }
 
     private native void nativeConstructor();