diff --git a/src/restate_context_impl.ts b/src/restate_context_impl.ts
index e22dcfcb..a128d786 100644
--- a/src/restate_context_impl.ts
+++ b/src/restate_context_impl.ts
@@ -311,7 +311,7 @@ export class RestateGrpcContextImpl implements RestateGrpcContext {
     const msg = AwakeableEntryMessage.create();
     const promise = this.stateMachine
       .handleUserCodeMessage<Buffer>(AWAKEABLE_ENTRY_MESSAGE_TYPE, msg)
-      .then((result: Buffer | void) => {
+      .then2((result: Buffer | void) => {
         if (!(result instanceof Buffer)) {
           // This should either be a filled buffer or an empty buffer but never anything else.
           throw RetryableError.internal(
diff --git a/src/state_machine.ts b/src/state_machine.ts
index 2b706e19..6f1d96fb 100644
--- a/src/state_machine.ts
+++ b/src/state_machine.ts
@@ -114,11 +114,11 @@ export class StateMachine<I, O> implements RestateStreamConsumer {
     completedFlag?: boolean,
     protocolVersion?: number,
     requiresAckFlag?: boolean
-  ): Promise<T | void> {
+  ): WrappedPromise<T | void> {
     // if the state machine is already closed, return a promise that never
     // completes, so that the user code does not resume
     if (this.stateMachineClosed) {
-      return new CompletablePromise<T>().promise;
+      return wrapDeeply(new CompletablePromise<T>().promise);
     }
 
     const promise = this.journal.handleUserSideMessage(messageType, message);
@@ -151,17 +151,14 @@ export class StateMachine<I, O> implements RestateStreamConsumer {
       );
     }
 
-    if (!p.SUSPENSION_TRIGGERS.includes(messageType)) {
-      return promise;
-    }
-
-    const proxified: Promise<T> = wrapDeeply(promise, () => {
+    return wrapDeeply(promise, () => {
+      if (!p.SUSPENSION_TRIGGERS.includes(messageType)) {
+        return;
+      }
       if (this.journal.isUnResolved(journalIndex)) {
         this.scheduleSuspension();
       }
     });
-
-    return proxified;
   }
 
   /**
@@ -499,9 +496,40 @@ export class StateMachine<I, O> implements RestateStreamConsumer {
  * Returns a promise that wraps the original promise and calls cb() at the first time
  * this promise or any nested promise that is chained to it is awaited. (then-ed)
  */
-const wrapDeeply = <T>(promise: Promise<T>, cb: () => void): Promise<T> => {
+
+/* eslint-disable @typescript-eslint/no-explicit-any */
+export type WrappedPromise<T> = Promise<T> & {
+  then2: <TResult1 = T, TResult2 = never>(
+    onfulfilled?:
+      | ((value: T) => TResult1 | PromiseLike<TResult1>)
+      | null
+      | undefined,
+    onrejected?:
+      | ((reason: any) => TResult2 | PromiseLike<TResult2>)
+      | null
+      | undefined
+  ) => Promise<TResult1 | TResult2>;
+};
+
+const wrapDeeply = <T>(
+  promise: Promise<T>,
+  cb?: () => void
+): WrappedPromise<T> => {
   /* eslint-disable @typescript-eslint/no-explicit-any */
   return {
+    then2: function <TResult1 = T, TResult2 = never>(
+      onfulfilled?:
+        | ((value: T) => TResult1 | PromiseLike<TResult1>)
+        | null
+        | undefined,
+      onrejected?:
+        | ((reason: any) => TResult2 | PromiseLike<TResult2>)
+        | null
+        | undefined
+    ): Promise<TResult1 | TResult2> {
+      return wrapDeeply(promise.then(onfulfilled, onrejected), cb);
+    },
+
     then: function <TResult1 = T, TResult2 = never>(
       onfulfilled?:
         | ((value: T) => TResult1 | PromiseLike<TResult1>)
@@ -512,7 +540,9 @@ const wrapDeeply = <T>(promise: Promise<T>, cb: () => void): Promise<T> => {
         | null
         | undefined
     ): Promise<TResult1 | TResult2> {
-      cb();
+      if (cb !== undefined) {
+        cb();
+      }
       return promise.then(onfulfilled, onrejected);
     },
     catch: function <TResult = never>(