diff --git a/internal/codeintel/resolvers/codenav.go b/internal/codeintel/resolvers/codenav.go
index 07538597c8e..e7346efe1a4 100644
--- a/internal/codeintel/resolvers/codenav.go
+++ b/internal/codeintel/resolvers/codenav.go
@@ -2,8 +2,6 @@ package resolvers
 
 import (
 	"context"
-	"encoding/base64"
-	"encoding/json"
 	"fmt"
 	"path"
 	"strings"
@@ -343,13 +341,10 @@ func (args *UsagesForSymbolArgs) Resolve(
 	}
 	var cursor codenav.UsagesCursor
 	if args.After != nil {
-		bytes, err := base64.StdEncoding.DecodeString(*args.After)
+		cursor, err = codenav.DecodeUsagesCursor(*args.After)
 		if err != nil {
 			return out, errors.Wrap(err, "invalid after: cursor")
 		}
-		if err = json.Unmarshal(bytes, &cursor); err != nil {
-			return out, errors.Wrap(err, "invalid after: cursor")
-		}
 	} else {
 		cursor.CursorType = codenav.CursorTypeDefinitions
 	}