diff --git a/src/main/scala/gitbucket/core/service/SshKeyService.scala b/src/main/scala/gitbucket/core/service/SshKeyService.scala
index fb317e9..5feb119 100644
--- a/src/main/scala/gitbucket/core/service/SshKeyService.scala
+++ b/src/main/scala/gitbucket/core/service/SshKeyService.scala
@@ -13,7 +13,7 @@
     SshKeys.filter(_.userName === userName.bind).sortBy(_.sshKeyId).list
 
   def getAllKeys()(implicit s: Session): List[SshKey] =
-  	SshKeys.list
+    SshKeys.filter(_.publicKey.trim =!= "").list
 
   def deletePublicKey(userName: String, sshKeyId: Int)(implicit s: Session): Unit =
     SshKeys filter (_.byPrimaryKey(userName, sshKeyId)) delete
diff --git a/src/main/scala/gitbucket/core/ssh/PublicKeyAuthenticator.scala b/src/main/scala/gitbucket/core/ssh/PublicKeyAuthenticator.scala
index 507a8ee..7e06eea 100644
--- a/src/main/scala/gitbucket/core/ssh/PublicKeyAuthenticator.scala
+++ b/src/main/scala/gitbucket/core/ssh/PublicKeyAuthenticator.scala
@@ -51,10 +51,7 @@
       Database()
       .withSession { implicit dbSession => getAllKeys() }
       .filter { sshKey =>
-        Option(sshKey.publicKey)
-        .filter(_.trim.nonEmpty)
-        .flatMap(SshUtil.str2PublicKey)
-        .exists(_ == key)
+        SshUtil.str2PublicKey(sshKey.publicKey).exists(_ == key)
       }
       .map(_.userName)
       .distinct