diff --git a/server/src/service/bufferService.ts b/server/src/service/bufferService.ts
index 989ebf936..d47a6472e 100755
--- a/server/src/service/bufferService.ts
+++ b/server/src/service/bufferService.ts
@@ -13,6 +13,7 @@ export interface IBufferService {
 	scheduleNextFlush(): void;
 	flushBuffer(): Promise<void>;
 	flushGeoBuffer(): Promise<void>;
+	shutdown(): Promise<void>;
 }
 
 export class BufferService implements IBufferService {
@@ -152,4 +153,13 @@ export class BufferService implements IBufferService {
 			this.geoBuffer = [];
 		}
 	}
+
+	async shutdown() {
+		if (this.bufferTimer) {
+			clearTimeout(this.bufferTimer);
+			this.bufferTimer = null;
+		}
+		await this.flushBuffer();
+		await this.flushGeoBuffer();
+	}
 }