diff --git a/src/mms/iso_mms/client/mms_client_connection.c b/src/mms/iso_mms/client/mms_client_connection.c
index c409267f..2037ae38 100644
--- a/src/mms/iso_mms/client/mms_client_connection.c
+++ b/src/mms/iso_mms/client/mms_client_connection.c
@@ -931,7 +931,8 @@ handleAsyncResponse(MmsConnection self, ByteBuffer* response, uint32_t bufPos, M
         }
     }
 
-    removeFromOutstandingCalls(self, outstandingCall->invokeId);
+    if (err != MMS_ERROR_SERVICE_TIMEOUT)
+        removeFromOutstandingCalls(self, outstandingCall->invokeId);
 }
 
 static void