diff --git a/server/imports/api/talkgroups.ts b/server/imports/api/talkgroups.ts
index d2cfa19..39ff011 100644
--- a/server/imports/api/talkgroups.ts
+++ b/server/imports/api/talkgroups.ts
@@ -7,6 +7,10 @@ import { System } from '../../../imports/models/system';
 import { Talkgroup } from '../../../imports/models/talkgroup';
 
 if (Meteor.isServer) {
+    createApiHandler();
+}
+
+function createApiHandler(): void {
     WebApp.connectHandlers.use('/talkgroups', (req: IncomingMessage, res: ServerResponse) => {
         if (req.method === 'POST') {
             const form = new Form();
diff --git a/server/imports/api/upload.ts b/server/imports/api/upload.ts
index d5579da..f5ba1c8 100644
--- a/server/imports/api/upload.ts
+++ b/server/imports/api/upload.ts
@@ -6,6 +6,15 @@ import { Calls } from '../../../imports/collections/calls';
 import { Call } from '../../../imports/models/call';
 
 if (Meteor.isServer) {
+    createApiHandler();
+    createPruneCallsTimer();
+}
+
+function base64Encode(value: any): string {
+    return Buffer.from(value, 'binary').toString('base64');
+}
+
+function createApiHandler(): void {
     WebApp.connectHandlers.use('/upload', (req: IncomingMessage, res: ServerResponse) => {
         if (req.method === 'POST') {
             const form = new Form();
@@ -66,8 +75,6 @@ if (Meteor.isServer) {
 
             form.parse(req);
 
-            pruneCalls();
-
         } else {
             res.writeHead(404);
             res.end();
@@ -75,12 +82,8 @@ if (Meteor.isServer) {
     });
 }
 
-function base64Encode(value: any): string {
-    return Buffer.from(value, 'binary').toString('base64');
-}
-
-function urlEncode(mimeType: string, value: any): string {
-    return `data:${mimeType};base64,${base64Encode(value)}`;
+function createPruneCallsTimer(): void {
+    setInterval(() => pruneCalls(), 90000);
 }
 
 function getPruneDays(): number | null {
@@ -102,3 +105,7 @@ function pruneCalls(): void {
         });
     }
 }
+
+function urlEncode(mimeType: string, value: any): string {
+    return `data:${mimeType};base64,${base64Encode(value)}`;
+}