diff --git a/server/src/service/infrastructure/bufferService.ts b/server/src/service/infrastructure/bufferService.ts
index e64a07077..5a809eea5 100755
--- a/server/src/service/infrastructure/bufferService.ts
+++ b/server/src/service/infrastructure/bufferService.ts
@@ -12,7 +12,7 @@ class BufferService {
 	private SERVICE_NAME: string;
 	private buffer: any[];
 	private incidentBuffer: any[];
-	private bufferTimer: NodeJS.Timeout;
+	private bufferTimer: NodeJS.Timeout | null = null;
 	private checksService: any;
 
 	constructor({
@@ -122,6 +122,9 @@ class BufferService {
 	}
 
 	scheduleNextFlush() {
+		if (this.bufferTimer) {
+			clearTimeout(this.bufferTimer);
+		}
 		this.bufferTimer = setTimeout(async () => {
 			try {
 				await this.flushBuffer();