diff --git a/modules/apps/callbacks/v2/ibc_middleware.go b/modules/apps/callbacks/v2/ibc_middleware.go
index 541fd7cf29c..e2c7df09b4a 100644
--- a/modules/apps/callbacks/v2/ibc_middleware.go
+++ b/modules/apps/callbacks/v2/ibc_middleware.go
@@ -216,7 +216,7 @@ func (im IBCMiddleware) OnAcknowledgementPacket(
 		return nil
 	}
 
-	sdkCtx := sdk.UnwrapSDKContext(ctx) // TODO: https://github.com/cosmos/ibc-go/issues/5917
+	sdkCtx := sdk.UnwrapSDKContext(ctx)
 	cbData, err := types.GetCallbackData(
 		packetData, payload.GetVersion(), payload.GetSourcePort(),
 		sdkCtx.GasMeter().GasRemaining(), im.maxCallbackGas, types.SourceCallbackKey,
@@ -277,7 +277,7 @@ func (im IBCMiddleware) OnTimeoutPacket(
 		return err
 	}
 
-	sdkCtx := sdk.UnwrapSDKContext(ctx) // TODO: https://github.com/cosmos/ibc-go/issues/5917
+	sdkCtx := sdk.UnwrapSDKContext(ctx)
 	cbData, err := types.GetCallbackData(
 		packetData, payload.GetVersion(), payload.GetSourcePort(),
 		sdkCtx.GasMeter().GasRemaining(), im.maxCallbackGas, types.SourceCallbackKey,
diff --git a/modules/apps/callbacks/v2/v2_test.go b/modules/apps/callbacks/v2/v2_test.go
index 1a73389ba62..b93886174ca 100644
--- a/modules/apps/callbacks/v2/v2_test.go
+++ b/modules/apps/callbacks/v2/v2_test.go
@@ -14,7 +14,7 @@ import (
 	simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	abci "github.com/cometbft/cometbft/api/cometbft/abci/v1"
+	abci "github.com/cometbft/cometbft/abci/types"
 
 	"github.com/cosmos/ibc-go/modules/apps/callbacks/testing/simapp"
 	"github.com/cosmos/ibc-go/modules/apps/callbacks/types"