diff --git a/src/modules/ghost_ocm.ts b/src/modules/ghost_ocm.ts
index 56e8e95..1b1acba 100644
--- a/src/modules/ghost_ocm.ts
+++ b/src/modules/ghost_ocm.ts
@@ -76,7 +76,7 @@ export default class GhostModule extends Module {
 					let period = 1;
 
 					// Count how many period
-					while(competitionPeriodStartTimestamp < ocmEventDate.competitionEndAt)
+					while(competitionPeriodStartTimestamp < ocmEventDate.competitionCloseAt)
 					{
 						
 						// Count period closing timestamp
diff --git a/src/util/games/ghost.ts b/src/util/games/ghost.ts
index c083c41..01a92e6 100644
--- a/src/util/games/ghost.ts
+++ b/src/util/games/ghost.ts
@@ -288,6 +288,10 @@ export async function saveGhostBattleResult(body: wm.protobuf.SaveGameResultRequ
                 if(body.rgResult?.periodId){
                     saveExOCM.periodId = body.rgResult?.periodId!;
                 }
+                else
+                {
+                    saveExOCM.periodId = 0;
+                }
                 if(body.rgResult?.brakingPoint){
                     saveExOCM.brakingPoint = body.rgResult?.brakingPoint!;
                 }