diff --git a/api/solana_wallet_middleware.go b/api/solana_wallet_middleware.go
index c178166f..00533a09 100644
--- a/api/solana_wallet_middleware.go
+++ b/api/solana_wallet_middleware.go
@@ -1,7 +1,6 @@
 package api
 
 import (
-	"context"
 	"crypto/ed25519"
 
 	"github.com/gofiber/fiber/v2"
@@ -9,8 +8,6 @@ import (
 	"go.uber.org/zap"
 )
 
-// SolanaWalletCtxKey is the context key used to pass a verified Solana wallet
-// from the HTTP middleware to the database layer.
 const SolanaWalletCtxKey = "solanaWallet"
 
 // solanaWalletMiddleware verifies Solana wallet signatures from request headers.
@@ -52,6 +49,6 @@ func (app *ApiServer) solanaWalletMiddleware(c *fiber.Ctx) error {
 	}
 
 	app.logger.Debug("solanaWalletMiddleware: verified", zap.String("wallet", wallet))
-	c.SetUserContext(context.WithValue(c.UserContext(), SolanaWalletCtxKey, wallet))
+	c.Locals(SolanaWalletCtxKey, wallet)
 	return c.Next()
 }
diff --git a/api/solana_wallet_middleware_test.go b/api/solana_wallet_middleware_test.go
index 81fc65fd..78ee045c 100644
--- a/api/solana_wallet_middleware_test.go
+++ b/api/solana_wallet_middleware_test.go
@@ -18,7 +18,7 @@ func TestSolanaWalletMiddleware(t *testing.T) {
 	var capturedWallet string
 	testApp := fiber.New()
 	testApp.Get("/", app.solanaWalletMiddleware, func(c *fiber.Ctx) error {
-		if w, ok := c.UserContext().Value(SolanaWalletCtxKey).(string); ok {
+		if w, ok := c.Context().Value(SolanaWalletCtxKey).(string); ok {
 			capturedWallet = w
 		}
 		return c.SendStatus(fiber.StatusOK)