diff --git a/handler/handler.go b/handler/handler.go
index 14e196335310183015bc3454e924dfba21dd13a1..3032b532cddae8a6bd17246705f64e79c445e5ff 100644
--- a/handler/handler.go
+++ b/handler/handler.go
@@ -28,7 +28,6 @@ import (
 	"code.vereign.com/code/viam-apis/authentication"
 	"code.vereign.com/code/viam-apis/key-storage-agent/api"
 	"code.vereign.com/code/viam-apis/utils"
-	"code.vereign.com/code/viam-apis/system"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc/metadata"
 )
@@ -237,11 +236,9 @@ func (s *KeyStorageServerImpl) GetKeyId(ctx context.Context, in *api.GetKeyIdByK
 
 	keyIdResponse := &api.GetKeyIdByKeyResponse{}
 
-	stringMessage := &system.String{}
-	
-	hasData, errorsString, err := dataStorageClient.GetData(keyToKeyIdTable, in.PublicKey, stringMessage)
-	if err == nil && errorsString == "" && hasData {
-		keyIdResponse.KeyId = stringMessage.Value
+	stringMessage, errorsString, err := dataStorageClient.GetString(keyToKeyIdTable, in.PublicKey)
+	if err == nil && errorsString == "" {
+		keyIdResponse.KeyId = stringMessage
 		return keyIdResponse, nil
 	} else {
 		if err != nil {