diff --git a/protocol/app/upgrades/v5.0.0/upgrade.go b/protocol/app/upgrades/v5.0.0/upgrade.go
index b3326fe4e2..56f78e72c5 100644
--- a/protocol/app/upgrades/v5.0.0/upgrade.go
+++ b/protocol/app/upgrades/v5.0.0/upgrade.go
@@ -17,8 +17,7 @@ import (
 func perpetualsUpgrade(
 	ctx sdk.Context,
 	perpetualsKeeper perptypes.PerpetualsKeeper,
-) error {
-
+) {
 	// Set all perpetuals to cross market type
 	perpetuals := perpetualsKeeper.GetAllPerpetuals(ctx)
 	for _, p := range perpetuals {
@@ -29,8 +28,6 @@ func perpetualsUpgrade(
 			panic(fmt.Sprintf("failed to set perpetual market type for perpetual %d: %s", p.GetId(), err))
 		}
 	}
-
-	return nil
 }
 
 func CreateUpgradeHandler(
diff --git a/protocol/mocks/PerpetualsKeeper.go b/protocol/mocks/PerpetualsKeeper.go
index 46a4afac45..a82605b354 100644
--- a/protocol/mocks/PerpetualsKeeper.go
+++ b/protocol/mocks/PerpetualsKeeper.go
@@ -70,6 +70,22 @@ func (_m *PerpetualsKeeper) GetAddPremiumVotes(ctx types.Context) *perpetualstyp
 	return r0
 }
 
+// GetAllPerpetuals provides a mock function with given fields: ctx
+func (_m *PerpetualsKeeper) GetAllPerpetuals(ctx types.Context) []perpetualstypes.Perpetual {
+	ret := _m.Called(ctx)
+
+	var r0 []perpetualstypes.Perpetual
+	if rf, ok := ret.Get(0).(func(types.Context) []perpetualstypes.Perpetual); ok {
+		r0 = rf(ctx)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).([]perpetualstypes.Perpetual)
+		}
+	}
+
+	return r0
+}
+
 // GetMarginRequirements provides a mock function with given fields: ctx, id, bigQuantums
 func (_m *PerpetualsKeeper) GetMarginRequirements(ctx types.Context, id uint32, bigQuantums *big.Int) (*big.Int, *big.Int, error) {
 	ret := _m.Called(ctx, id, bigQuantums)
@@ -283,6 +299,30 @@ func (_m *PerpetualsKeeper) SetParams(ctx types.Context, params perpetualstypes.
 	return r0
 }
 
+// SetPerpetualMarketType provides a mock function with given fields: ctx, id, marketType
+func (_m *PerpetualsKeeper) SetPerpetualMarketType(ctx types.Context, id uint32, marketType perpetualstypes.PerpetualMarketType) (perpetualstypes.Perpetual, error) {
+	ret := _m.Called(ctx, id, marketType)
+
+	var r0 perpetualstypes.Perpetual
+	var r1 error
+	if rf, ok := ret.Get(0).(func(types.Context, uint32, perpetualstypes.PerpetualMarketType) (perpetualstypes.Perpetual, error)); ok {
+		return rf(ctx, id, marketType)
+	}
+	if rf, ok := ret.Get(0).(func(types.Context, uint32, perpetualstypes.PerpetualMarketType) perpetualstypes.Perpetual); ok {
+		r0 = rf(ctx, id, marketType)
+	} else {
+		r0 = ret.Get(0).(perpetualstypes.Perpetual)
+	}
+
+	if rf, ok := ret.Get(1).(func(types.Context, uint32, perpetualstypes.PerpetualMarketType) error); ok {
+		r1 = rf(ctx, id, marketType)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
 type mockConstructorTestingTNewPerpetualsKeeper interface {
 	mock.TestingT
 	Cleanup(func())
diff --git a/protocol/x/perpetuals/keeper/perpetual.go b/protocol/x/perpetuals/keeper/perpetual.go
index dc0f0e9b31..3cb063d3de 100644
--- a/protocol/x/perpetuals/keeper/perpetual.go
+++ b/protocol/x/perpetuals/keeper/perpetual.go
@@ -191,7 +191,6 @@ func (k Keeper) SetPerpetualMarketType(
 	perpetualId uint32,
 	marketType types.PerpetualMarketType,
 ) (types.Perpetual, error) {
-
 	if marketType == types.PerpetualMarketType_PERPETUAL_MARKET_TYPE_UNSPECIFIED {
 		return types.Perpetual{}, errorsmod.Wrap(
 			types.ErrInvalidMarketType,