diff --git a/src/mms/iso_mms/client/mms_client_connection.c b/src/mms/iso_mms/client/mms_client_connection.c
index 6f743b0b..0ba12801 100644
--- a/src/mms/iso_mms/client/mms_client_connection.c
+++ b/src/mms/iso_mms/client/mms_client_connection.c
@@ -1,7 +1,7 @@
 /*
  *  mms_client_connection.c
  *
- *  Copyright 2013-2022 Michael Zillgith
+ *  Copyright 2013-2024 Michael Zillgith
  *
  *  This file is part of libIEC61850.
  *
@@ -242,6 +242,10 @@ getNextInvokeId(MmsConnection self)
 
     Semaphore_wait(self->nextInvokeIdLock);
     self->nextInvokeId++;
+
+    if (self->nextInvokeId == 0)
+        self->nextInvokeId = 1;
+
     nextInvokeId = self->nextInvokeId;
     Semaphore_post(self->nextInvokeIdLock);