diff --git a/ts/background.preload.ts b/ts/background.preload.ts
index af1c741f56..083c28ff77 100644
--- a/ts/background.preload.ts
+++ b/ts/background.preload.ts
@@ -15,7 +15,8 @@ import type {
   ProcessedDataMessage,
 } from './textsecure/Types.d.ts';
 import { HTTPError } from './types/HTTPError.std.js';
-import createTaskWithTimeout, {
+import {
+  runTaskWithTimeout,
   suspendTasksWithTimeout,
   resumeTasksWithTimeout,
   reportLongRunningTasks,
@@ -603,8 +604,8 @@ export async function startApp(): Promise<void> {
     ): (event: E) => void {
       return (event: E): void => {
         drop(
-          eventHandlerQueue.add(
-            createTaskWithTimeout(
+          eventHandlerQueue.add(() =>
+            runTaskWithTimeout(
               async () => handler(event),
               `queuedEventListener(${event.type}, ${event.timeStamp})`
             )
diff --git a/ts/models/conversations.preload.ts b/ts/models/conversations.preload.ts
index 03bd1eaf51..1ad7347cab 100644
--- a/ts/models/conversations.preload.ts
+++ b/ts/models/conversations.preload.ts
@@ -66,7 +66,7 @@ import {
   cdsLookup,
   checkAccountExistence,
 } from '../textsecure/WebAPI.preload.js';
-import createTaskWithTimeout from '../textsecure/TaskWithTimeout.std.js';
+import { runTaskWithTimeout } from '../textsecure/TaskWithTimeout.std.js';
 import { MessageSender } from '../textsecure/SendMessage.preload.js';
 import type {
   CallbackResultType,
@@ -3849,8 +3849,6 @@ export class ConversationModel {
 
     this.jobQueue = this.jobQueue || new PQueue({ concurrency: 1 });
 
-    const taskWithTimeout = createTaskWithTimeout(callback, logId);
-
     const abortController = new AbortController();
     const { signal: abortSignal } = abortController;
 
@@ -3864,7 +3862,10 @@ export class ConversationModel {
       }
 
       try {
-        return await taskWithTimeout(abortSignal);
+        return await runTaskWithTimeout(
+          async () => callback(abortSignal),
+          logId
+        );
       } catch (error) {
         abortController.abort();
         throw error;
diff --git a/ts/shims/events.dom.ts b/ts/shims/events.dom.ts
index 8c0be29b9e..832879563e 100644
--- a/ts/shims/events.dom.ts
+++ b/ts/shims/events.dom.ts
@@ -1,8 +1,7 @@
 // Copyright 2019 Signal Messenger, LLC
 // SPDX-License-Identifier: AGPL-3.0-only
 
-import createTaskWithTimeout from '../textsecure/TaskWithTimeout.std.js';
-import { MINUTE } from '../util/durations/index.std.js';
+import { runTaskWithTimeout } from '../textsecure/TaskWithTimeout.std.js';
 import { explodePromise } from '../util/explodePromise.std.js';
 
 // Matching Whisper.events.trigger API
@@ -11,16 +10,13 @@ export function trigger(name: string, ...rest: Array<any>): void {
   window.Whisper.events.emit(name, ...rest);
 }
 
-export const waitForEvent = (
-  eventName: string,
-  timeout: number = 2 * MINUTE
-): Promise<void> =>
-  createTaskWithTimeout(
-    (event: string): Promise<void> => {
+export const waitForEvent = (eventName: string): Promise<void> =>
+  runTaskWithTimeout(
+    () => {
       const { promise, resolve } = explodePromise<void>();
-      window.Whisper.events.once(event, () => resolve());
+      window.Whisper.events.once(eventName, () => resolve());
       return promise;
     },
     `waitForEvent:${eventName}`,
-    { timeout }
-  )(eventName);
+    'short-lived'
+  );
diff --git a/ts/sql/Client.preload.ts b/ts/sql/Client.preload.ts
index c986987b2e..91cafbdcb6 100644
--- a/ts/sql/Client.preload.ts
+++ b/ts/sql/Client.preload.ts
@@ -19,7 +19,7 @@ import { assertDev, softAssert } from '../util/assert.std.js';
 import { mapObjectWithSpec } from '../util/mapObjectWithSpec.std.js';
 import { maybeDeleteAttachmentFile } from '../util/migrations.preload.js';
 import { cleanDataForIpc } from './cleanDataForIpc.std.js';
-import createTaskWithTimeout from '../textsecure/TaskWithTimeout.std.js';
+import { runTaskWithTimeout } from '../textsecure/TaskWithTimeout.std.js';
 import { isValidUuid, isValidUuidV7 } from '../util/isValidUuid.std.js';
 import { formatJobForInsert } from '../jobs/formatJobForInsert.std.js';
 import {
@@ -904,10 +904,10 @@ async function invokeWithTimeout(
   name: string,
   ...args: Array<unknown>
 ): Promise<void> {
-  return createTaskWithTimeout(
+  return runTaskWithTimeout(
     () => ipc.invoke(name, ...args),
     `callChannel call to ${name}`
-  )();
+  );
 }
 
 export function pauseWriteAccess(): Promise<void> {
diff --git a/ts/sql/channels.preload.ts b/ts/sql/channels.preload.ts
index b3a4fbb48c..c6a9ea33bf 100644
--- a/ts/sql/channels.preload.ts
+++ b/ts/sql/channels.preload.ts
@@ -3,7 +3,7 @@
 
 import { ipcRenderer } from 'electron';
 import { createLogger } from '../logging/log.std.js';
-import createTaskWithTimeout from '../textsecure/TaskWithTimeout.std.js';
+import { runTaskWithTimeout } from '../textsecure/TaskWithTimeout.std.js';
 import { explodePromise } from '../util/explodePromise.std.js';
 import { missingCaseError } from '../util/missingCaseError.std.js';
 
@@ -45,7 +45,7 @@ export async function ipcInvoke<T>(
   }
 
   activeJobCount += 1;
-  return createTaskWithTimeout(async () => {
+  return runTaskWithTimeout(async () => {
     try {
       const result = await ipcRenderer.invoke(channel, name, ...args);
       if (!result.ok) {
@@ -58,7 +58,7 @@ export async function ipcInvoke<T>(
         resolveShutdown?.();
       }
     }
-  }, `SQL channel call (${access}, ${fnName})`)();
+  }, `SQL channel call (${access}, ${fnName})`);
 }
 
 export async function doShutdown(): Promise<void> {
diff --git a/ts/state/smart/Preferences.preload.tsx b/ts/state/smart/Preferences.preload.tsx
index bd54b1e584..3449891434 100644
--- a/ts/state/smart/Preferences.preload.tsx
+++ b/ts/state/smart/Preferences.preload.tsx
@@ -60,7 +60,7 @@ import { writeProfile } from '../../services/writeProfile.preload.js';
 import { keyTransparency } from '../../services/keyTransparency.preload.js';
 import { getConversation } from '../../util/getConversation.preload.js';
 import { waitForEvent } from '../../shims/events.dom.js';
-import { DAY, MINUTE } from '../../util/durations/index.std.js';
+import { DAY } from '../../util/durations/index.std.js';
 import { sendSyncRequests } from '../../textsecure/syncRequests.preload.js';
 import { SmartUpdateDialog } from './UpdateDialog.preload.js';
 import { Preferences } from '../../components/Preferences.dom.js';
@@ -258,10 +258,7 @@ export function SmartPreferences(): React.JSX.Element | null {
   // The weird ones
 
   const makeSyncRequest = async () => {
-    const contactSyncComplete = waitForEvent(
-      'contactSync:complete',
-      5 * MINUTE
-    );
+    const contactSyncComplete = waitForEvent('contactSync:complete');
     return Promise.all([sendSyncRequests(), contactSyncComplete]);
   };
 
diff --git a/ts/test-node/TaskWithTimeout_test.std.ts b/ts/test-node/TaskWithTimeout_test.std.ts
index f200f1135b..5210a2138c 100644
--- a/ts/test-node/TaskWithTimeout_test.std.ts
+++ b/ts/test-node/TaskWithTimeout_test.std.ts
@@ -6,12 +6,14 @@ import * as sinon from 'sinon';
 
 import { sleep } from '../util/sleep.std.js';
 import { explodePromise } from '../util/explodePromise.std.js';
-import createTaskWithTimeout, {
+import { MINUTE } from '../util/durations/index.std.js';
+import {
+  runTaskWithTimeout,
   suspendTasksWithTimeout,
   resumeTasksWithTimeout,
 } from '../textsecure/TaskWithTimeout.std.js';
 
-describe('createTaskWithTimeout', () => {
+describe('runTaskWithTimeout', () => {
   let sandbox: sinon.SinonSandbox;
 
   beforeEach(() => {
@@ -24,18 +26,16 @@ describe('createTaskWithTimeout', () => {
 
   it('resolves when promise resolves', async () => {
     const task = () => Promise.resolve('hi!');
-    const taskWithTimeout = createTaskWithTimeout(task, 'resolving-task');
-
-    const result = await taskWithTimeout();
+    const result = await runTaskWithTimeout(task, 'resolving-task');
     assert.strictEqual(result, 'hi!');
   });
 
   it('flows error from promise back', async () => {
     const error = new Error('original');
     const task = () => Promise.reject(error);
-    const taskWithTimeout = createTaskWithTimeout(task, 'rejecting-task');
+    const taskWithTimeout = runTaskWithTimeout(task, 'rejecting-task');
 
-    await assert.isRejected(taskWithTimeout(), 'original');
+    await assert.isRejected(taskWithTimeout, 'original');
   });
 
   it('rejects if promise takes too long (this one logs error to console)', async () => {
@@ -45,11 +45,11 @@ describe('createTaskWithTimeout', () => {
 
     // Never resolves
     const task = () => pause;
-    const taskWithTimeout = createTaskWithTimeout(task, 'slow-task');
+    const taskWithTimeout = runTaskWithTimeout(task, 'slow-task');
 
-    const promise = assert.isRejected(taskWithTimeout());
+    const promise = assert.isRejected(taskWithTimeout);
 
-    await clock.runToLastAsync();
+    await clock.runAllAsync();
 
     await promise;
   });
@@ -61,17 +61,9 @@ describe('createTaskWithTimeout', () => {
     const task = () => {
       throw error;
     };
-    const taskWithTimeout = createTaskWithTimeout(task, 'throwing-task');
+    const taskWithTimeout = runTaskWithTimeout(task, 'throwing-task');
     await clock.runToLastAsync();
-    await assert.isRejected(taskWithTimeout(), 'Task is throwing!');
-  });
-
-  it('passes arguments to the underlying function', async () => {
-    const task = (arg: string) => Promise.resolve(arg);
-    const taskWithTimeout = createTaskWithTimeout(task, 'arguments-task');
-
-    const result = await taskWithTimeout('hi!');
-    assert.strictEqual(result, 'hi!');
+    await assert.isRejected(taskWithTimeout, 'Task is throwing!');
   });
 
   it('suspends and resumes tasks', async () => {
@@ -81,25 +73,21 @@ describe('createTaskWithTimeout', () => {
 
     const task = async () => {
       state = 1;
-      await sleep(900);
+      await sleep(2 * MINUTE - 100);
       state = 2;
-      await sleep(900);
+      await sleep(2 * MINUTE - 100);
       state = 3;
     };
-    const taskWithTimeout = createTaskWithTimeout(task, 'suspend-task', {
-      timeout: 1000,
-    });
-
-    const promise = taskWithTimeout();
+    const promise = runTaskWithTimeout(task, 'suspend-task', 'short-lived');
 
     assert.strictEqual(state, 1);
 
     suspendTasksWithTimeout();
-    await clock.tickAsync(900);
+    await clock.tickAsync(2 * MINUTE - 100);
     assert.strictEqual(state, 2);
 
     resumeTasksWithTimeout();
-    await clock.tickAsync(900);
+    await clock.tickAsync(2 * MINUTE - 100);
     assert.strictEqual(state, 3);
 
     await promise;
@@ -112,17 +100,17 @@ describe('createTaskWithTimeout', () => {
 
     // Never resolves
     const task = () => pause;
-    const taskWithTimeout = createTaskWithTimeout(task, 'suspend-slow-task');
+    const taskWithTimeout = runTaskWithTimeout(task, 'suspend-slow-task');
 
-    const promise = assert.isRejected(taskWithTimeout());
+    const promise = assert.isRejected(taskWithTimeout);
 
     suspendTasksWithTimeout();
 
-    await clock.runToLastAsync();
+    await clock.runAllAsync();
 
     resumeTasksWithTimeout();
 
-    await clock.runToLastAsync();
+    await clock.runAllAsync();
 
     await promise;
   });
diff --git a/ts/textsecure/AccountManager.preload.ts b/ts/textsecure/AccountManager.preload.ts
index 8eba86b092..c63bcfb342 100644
--- a/ts/textsecure/AccountManager.preload.ts
+++ b/ts/textsecure/AccountManager.preload.ts
@@ -31,7 +31,7 @@ import type {
   KyberPreKeyType,
   PniKeyMaterialType,
 } from './Types.d.ts';
-import createTaskWithTimeout from './TaskWithTimeout.std.js';
+import { runTaskWithTimeout } from './TaskWithTimeout.std.js';
 import * as Bytes from '../Bytes.std.js';
 import * as Errors from '../types/errors.std.js';
 import {
@@ -268,9 +268,10 @@ export default class AccountManager extends EventTarget {
 
   async #queueTask<T>(task: () => Promise<T>): Promise<T> {
     this.pendingQueue = this.pendingQueue || new PQueue({ concurrency: 1 });
-    const taskWithTimeout = createTaskWithTimeout(task, 'AccountManager task');
 
-    return this.pendingQueue.add(taskWithTimeout);
+    return this.pendingQueue.add(() =>
+      runTaskWithTimeout(task, 'AccountManager task')
+    );
   }
 
   encryptDeviceName(
diff --git a/ts/textsecure/MessageReceiver.preload.ts b/ts/textsecure/MessageReceiver.preload.ts
index d35337a9c7..853d8dbcf2 100644
--- a/ts/textsecure/MessageReceiver.preload.ts
+++ b/ts/textsecure/MessageReceiver.preload.ts
@@ -76,7 +76,7 @@ import { signalProtocolStore } from '../SignalProtocolStore.preload.js';
 import { SignalService as Proto } from '../protobuf/index.std.js';
 import { deriveGroupFields, MASTER_KEY_LENGTH } from '../groups.preload.js';
 
-import createTaskWithTimeout from './TaskWithTimeout.std.js';
+import { runTaskWithTimeout } from './TaskWithTimeout.std.js';
 import {
   processAttachment,
   processDataMessage,
@@ -245,10 +245,6 @@ export type MessageReceiverOptions = {
   serverTrustRoots: Array<string>;
 };
 
-const TASK_WITH_TIMEOUT_OPTIONS = {
-  timeout: 2 * durations.MINUTE,
-};
-
 const LOG_UNEXPECTED_URGENT_VALUES = false;
 const MUST_BE_URGENT_TYPES: Array<SendTypesType> = [
   'message',
@@ -391,13 +387,13 @@ export default class MessageReceiver
 
       if (request.requestType === ServerRequestType.ApiEmptyQueue) {
         drop(
-          this.#incomingQueue.add(
-            createTaskWithTimeout(
+          this.#incomingQueue.add(() =>
+            runTaskWithTimeout(
               async () => {
                 this.#onEmpty();
               },
               'incomingQueue/onEmpty',
-              TASK_WITH_TIMEOUT_OPTIONS
+              'short-lived'
             )
           )
         );
@@ -487,12 +483,8 @@ export default class MessageReceiver
     };
 
     drop(
-      this.#incomingQueue.add(
-        createTaskWithTimeout(
-          job,
-          'incomingQueue/websocket',
-          TASK_WITH_TIMEOUT_OPTIONS
-        )
+      this.#incomingQueue.add(() =>
+        runTaskWithTimeout(job, 'incomingQueue/websocket', 'short-lived')
       )
     );
   }
@@ -510,13 +502,11 @@ export default class MessageReceiver
 
   #addCachedMessagesToQueue(): Promise<void> {
     log.info('addCachedMessagesToQueue');
-    return this.#incomingQueue.add(
-      createTaskWithTimeout(
+    return this.#incomingQueue.add(() =>
+      runTaskWithTimeout(
         async () => this.#queueAllCached(),
         'incomingQueue/queueAllCached',
-        {
-          timeout: 10 * durations.MINUTE,
-        }
+        'long-running'
       )
     );
   }
@@ -547,11 +537,11 @@ export default class MessageReceiver
         TaskType.Encrypted
       );
 
-    return this.#incomingQueue.add(
-      createTaskWithTimeout(
+    return this.#incomingQueue.add(() =>
+      runTaskWithTimeout(
         waitForIncomingQueue,
         'drain/waitForIncoming',
-        TASK_WITH_TIMEOUT_OPTIONS
+        'short-lived'
       )
     );
   }
@@ -732,11 +722,11 @@ export default class MessageReceiver
 
   async #dispatchAndWait(id: string, event: Event): Promise<void> {
     drop(
-      this.#appQueue.add(
-        createTaskWithTimeout(
+      this.#appQueue.add(() =>
+        runTaskWithTimeout(
           async () => Promise.all(this.dispatchEvent(event)),
           `dispatchEvent(${event.type}, ${id})`,
-          TASK_WITH_TIMEOUT_OPTIONS
+          'short-lived'
         )
       )
     );
@@ -764,9 +754,7 @@ export default class MessageReceiver
         ? this.#encryptedQueue
         : this.#decryptedQueue;
 
-    return queue.add(
-      createTaskWithTimeout(task, id, TASK_WITH_TIMEOUT_OPTIONS)
-    );
+    return queue.add(() => runTaskWithTimeout(task, id, 'short-lived'));
   }
 
   #onEmpty(): void {
@@ -796,12 +784,8 @@ export default class MessageReceiver
 
       // We don't await here because we don't want this to gate future message processing
       drop(
-        this.#appQueue.add(
-          createTaskWithTimeout(
-            emitEmpty,
-            'emitEmpty',
-            TASK_WITH_TIMEOUT_OPTIONS
-          )
+        this.#appQueue.add(() =>
+          runTaskWithTimeout(emitEmpty, 'emitEmpty', 'short-lived')
         )
       );
     };
@@ -829,11 +813,11 @@ export default class MessageReceiver
     const waitForCacheAddBatcher = async () => {
       await this.#decryptAndCacheBatcher.onIdle();
       drop(
-        this.#incomingQueue.add(
-          createTaskWithTimeout(
+        this.#incomingQueue.add(() =>
+          runTaskWithTimeout(
             waitForIncomingQueue,
             'onEmpty/waitForIncoming',
-            TASK_WITH_TIMEOUT_OPTIONS
+            'short-lived'
           )
         )
       );
@@ -969,11 +953,11 @@ export default class MessageReceiver
       this.#clearRetryTimeout();
       this.#retryCachedTimeout = setTimeout(() => {
         drop(
-          this.#incomingQueue.add(
-            createTaskWithTimeout(
+          this.#incomingQueue.add(() =>
+            runTaskWithTimeout(
               async () => this.#queueAllCached(),
               'queueAllCached',
-              TASK_WITH_TIMEOUT_OPTIONS
+              'short-lived'
             )
           )
         );
@@ -1214,15 +1198,15 @@ export default class MessageReceiver
     log.info('queueing decrypted envelope', id);
 
     const task = this.#handleDecryptedEnvelope.bind(this, envelope, plaintext);
-    const taskWithTimeout = createTaskWithTimeout(
-      task,
-      `queueDecryptedEnvelope ${id}`,
-      TASK_WITH_TIMEOUT_OPTIONS
-    );
 
     try {
       await this.#addToQueue(
-        taskWithTimeout,
+        () =>
+          runTaskWithTimeout(
+            task,
+            `queueDecryptedEnvelope ${id}`,
+            'short-lived'
+          ),
         `handleDecryptedEnvelope(${id})`,
         TaskType.Decrypted
       );
diff --git a/ts/textsecure/SendMessage.preload.ts b/ts/textsecure/SendMessage.preload.ts
index a59cda14a6..b0c5d88335 100644
--- a/ts/textsecure/SendMessage.preload.ts
+++ b/ts/textsecure/SendMessage.preload.ts
@@ -43,7 +43,7 @@ import {
   toPniObject,
   toServiceIdObject,
 } from '../util/ServiceId.node.js';
-import createTaskWithTimeout from './TaskWithTimeout.std.js';
+import { runTaskWithTimeout } from './TaskWithTimeout.std.js';
 import type { CallbackResultType } from './Types.d.ts';
 import type {
   SerializedCertificateType,
@@ -765,12 +765,9 @@ export class MessageSender {
 
     const queue = this.pendingMessages[id];
 
-    const taskWithTimeout = createTaskWithTimeout(
-      runJob,
-      `queueJobForServiceId ${serviceId} ${id}`
+    return queue.add(() =>
+      runTaskWithTimeout(runJob, `queueJobForServiceId ${serviceId} ${id}`)
     );
-
-    return queue.add(taskWithTimeout);
   }
 
   // Attachment upload functions
diff --git a/ts/textsecure/TaskWithTimeout.std.ts b/ts/textsecure/TaskWithTimeout.std.ts
index cc1130171f..b1960b8755 100644
--- a/ts/textsecure/TaskWithTimeout.std.ts
+++ b/ts/textsecure/TaskWithTimeout.std.ts
@@ -2,127 +2,116 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 
 import { MINUTE } from '../util/durations/index.std.js';
-import { clearTimeoutIfNecessary } from '../util/clearTimeoutIfNecessary.std.js';
 import { explodePromise } from '../util/explodePromise.std.js';
-import { toLogFormat } from '../types/errors.std.js';
+import { missingCaseError } from '../util/missingCaseError.std.js';
 import { createLogger } from '../logging/log.std.js';
 
+const TICK_INTERVAL = MINUTE / 2;
+
 const log = createLogger('TaskWithTimeout');
 
 type TaskType = {
   id: string;
-  startedAt: number | undefined;
-  suspend(): void;
-  resume(): void;
+  ticks: number;
+  maxTicks: number;
+  reject: (error: Error) => void;
 };
 
 const tasks = new Set<TaskType>();
-let shouldStartTimers = true;
+let shouldStartTicking = true;
+
+let tickInterval: NodeJS.Timeout | undefined;
+
+function maybeStartTicking(): void {
+  if (!shouldStartTicking) {
+    return;
+  }
+
+  // Already ticking
+  if (tickInterval != null) {
+    return;
+  }
+
+  log.info('starting tick');
+  tickInterval = setInterval(() => {
+    for (const task of tasks) {
+      task.ticks += 1;
+      if (task.ticks < task.maxTicks) {
+        continue;
+      }
+
+      tasks.delete(task);
+      task.reject(new Error(`TaskWithTimeout(${task.id}) timed out`));
+    }
+  }, TICK_INTERVAL);
+}
 
 export function suspendTasksWithTimeout(): void {
+  if (!shouldStartTicking) {
+    return;
+  }
   log.info(`suspending ${tasks.size} tasks`);
-  shouldStartTimers = false;
-  for (const task of tasks) {
-    task.suspend();
+  shouldStartTicking = false;
+  if (tickInterval != null) {
+    log.info('stopping tick');
+    clearInterval(tickInterval);
+    tickInterval = undefined;
   }
 }
 
 export function resumeTasksWithTimeout(): void {
-  log.info(`resuming ${tasks.size} tasks`);
-  shouldStartTimers = true;
-  for (const task of tasks) {
-    task.resume();
+  if (shouldStartTicking) {
+    return;
   }
+  log.info(`resuming ${tasks.size} tasks`);
+  shouldStartTicking = true;
+  maybeStartTicking();
 }
 
 export function reportLongRunningTasks(): void {
-  const now = Date.now();
   for (const task of tasks) {
-    if (task.startedAt === undefined) {
-      continue;
-    }
-
-    const duration = Math.max(0, now - task.startedAt);
+    const duration = task.ticks * TICK_INTERVAL;
     if (duration > MINUTE) {
-      log.warn(`${task.id} has been running for ${duration}ms`);
+      log.warn(`${task.id} has been running for ~${duration}ms`);
     }
   }
 }
 
-export default function createTaskWithTimeout<T, Args extends Array<unknown>>(
-  task: (...args: Args) => Promise<T>,
+export async function runTaskWithTimeout<T>(
+  task: () => Promise<T>,
   id: string,
-  options: { timeout?: number } = {}
-): (...args: Args) => Promise<T> {
-  const timeout = options.timeout || 30 * MINUTE;
+  taskType: 'long-running' | 'short-lived' = 'long-running'
+): Promise<T> {
+  let maxTicks: number;
 
-  const timeoutError = new Error(`${id || ''} task did not complete in time.`);
+  if (taskType === 'long-running') {
+    maxTicks = (30 * MINUTE) / TICK_INTERVAL;
+  } else if (taskType === 'short-lived') {
+    maxTicks = (2 * MINUTE) / TICK_INTERVAL;
+  } else {
+    throw missingCaseError(taskType);
+  }
 
-  return async (...args: Args) => {
-    let complete = false;
+  const { promise: timerPromise, reject } = explodePromise<never>();
 
-    let timer: NodeJS.Timeout | undefined;
-
-    const { promise: timerPromise, reject } = explodePromise<never>();
-
-    const startTimer = () => {
-      stopTimer();
-
-      if (complete) {
-        return;
-      }
-
-      entry.startedAt = Date.now();
-      timer = setTimeout(() => {
-        if (complete) {
-          log.warn(`${id} task timed out, but was already complete`);
-          return;
-        }
-        complete = true;
-        tasks.delete(entry);
-
-        log.error(toLogFormat(timeoutError));
-        reject(timeoutError);
-      }, timeout);
-    };
-
-    const stopTimer = () => {
-      clearTimeoutIfNecessary(timer);
-      timer = undefined;
-    };
-
-    const entry: TaskType = {
-      id,
-      startedAt: undefined,
-      suspend: () => {
-        log.warn(`${id} task suspended`);
-        stopTimer();
-      },
-      resume: () => {
-        log.warn(`${id} task resumed`);
-        startTimer();
-      },
-    };
-
-    tasks.add(entry);
-    if (shouldStartTimers) {
-      startTimer();
-    }
-
-    let result: unknown;
-
-    const run = async (): Promise<void> => {
-      result = await task(...args);
-    };
-
-    try {
-      await Promise.race([run(), timerPromise]);
-
-      return result as T;
-    } finally {
-      complete = true;
-      tasks.delete(entry);
-      stopTimer();
-    }
+  const entry: TaskType = {
+    id,
+    ticks: 0,
+    maxTicks,
+    reject,
   };
+
+  tasks.add(entry);
+  maybeStartTicking();
+
+  try {
+    return await Promise.race([task(), timerPromise]);
+  } finally {
+    tasks.delete(entry);
+    if (tasks.size === 0 && tickInterval != null) {
+      log.info('stopping tick');
+      clearInterval(tickInterval);
+      tickInterval = undefined;
+    }
+  }
 }
diff --git a/ts/util/JobQueue.std.ts b/ts/util/JobQueue.std.ts
index 1b5a4d1f8c..72a7f45eb5 100644
--- a/ts/util/JobQueue.std.ts
+++ b/ts/util/JobQueue.std.ts
@@ -2,15 +2,13 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 
 import PQueue from 'p-queue';
-import createTaskWithTimeout from '../textsecure/TaskWithTimeout.std.js';
+import { runTaskWithTimeout } from '../textsecure/TaskWithTimeout.std.js';
 
 function createJobQueue(label: string) {
   const jobQueue = new PQueue({ concurrency: 1 });
 
   return (job: () => Promise<void>, id = '') => {
-    const taskWithTimeout = createTaskWithTimeout(job, `${label} ${id}`);
-
-    return jobQueue.add(taskWithTimeout);
+    return jobQueue.add(() => runTaskWithTimeout(job, `${label} ${id}`));
   };
 }