diff --git a/x/epochs/keeper/epoch.go b/x/epochs/keeper/epoch.go
index 660d60fd7e25..de5f0f51f9e0 100644
--- a/x/epochs/keeper/epoch.go
+++ b/x/epochs/keeper/epoch.go
@@ -28,8 +28,9 @@ func (k Keeper) AddEpochInfo(ctx context.Context, epoch types.EpochInfo) error {
 	if epoch.StartTime.IsZero() {
 		epoch.StartTime = k.environment.HeaderService.GetHeaderInfo(ctx).Time
 	}
-	epoch.CurrentEpochStartHeight = k.environment.HeaderService.GetHeaderInfo(ctx).Height
-
+	if epoch.CurrentEpochStartHeight == 0 {
+		epoch.CurrentEpochStartHeight = k.environment.HeaderService.GetHeaderInfo(ctx).Height
+	}
 	return k.EpochInfo.Set(ctx, epoch.Identifier, epoch)
 }