diff --git a/src/modules/ghost_ocm.ts b/src/modules/ghost_ocm.ts
index 2304eae..06f2b39 100644
--- a/src/modules/ghost_ocm.ts
+++ b/src/modules/ghost_ocm.ts
@@ -103,15 +103,17 @@ export default class GhostModule extends Module {
 						competitionPeriodStartTimestamp = competitionPeriodEndTimeStamp + ocmEventDate.lengthOfInterval;
 					}
 
-					if(ocmEventDate.lengthOfInterval !== 0)
+					// Check the gap between quali close and main draw start timestamp
+					let checkQualiMainGap = ocmEventDate.competitionStartAt - ocmEventDate.qualifyingPeriodCloseAt;
+					if(checkQualiMainGap < 3600)
 					{
-						let qualifyingEndTimeStamp = ocmEventDate.qualifyingPeriodCloseAt - ocmEventDate.lengthOfInterval
+						let changeTime = ocmEventDate.competitionStartAt - 3600;
 						await prisma.oCMEvent.update({
 							where:{
 								dbId: ocmEventDate.dbId
 							},
 							data:{
-								qualifyingPeriodCloseAt: qualifyingEndTimeStamp
+								qualifyingPeriodCloseAt: changeTime
 							}
 						})
 					}