diff --git a/handler/handler.go b/handler/handler.go
index 3032b532cddae8a6bd17246705f64e79c445e5ff..4c2ce23cb1b61be9694abca7ad1792dcdafc188d 100644
--- a/handler/handler.go
+++ b/handler/handler.go
@@ -236,9 +236,9 @@ func (s *KeyStorageServerImpl) GetKeyId(ctx context.Context, in *api.GetKeyIdByK
 
 	keyIdResponse := &api.GetKeyIdByKeyResponse{}
 
-	stringMessage, errorsString, err := dataStorageClient.GetString(keyToKeyIdTable, in.PublicKey)
-	if err == nil && errorsString == "" {
-		keyIdResponse.KeyId = stringMessage
+	keyId, errorsString, err := dataStorageClient.GetString(keyToKeyIdTable, in.PublicKey)
+	if err == nil && errorsString == "" && keyId != "" {
+		keyIdResponse.KeyId = keyId
 		return keyIdResponse, nil
 	} else {
 		if err != nil {