diff --git a/src/mms/iso_common/iso_connection_parameters.c b/src/mms/iso_common/iso_connection_parameters.c
index aa5334b31..23df39e8f 100644
--- a/src/mms/iso_common/iso_connection_parameters.c
+++ b/src/mms/iso_common/iso_connection_parameters.c
@@ -63,7 +63,6 @@ AcseAuthenticationParameter_setAuthMechanism(AcseAuthenticationParameter self, A
     self->mechanism = mechanism;
 }
 
-
 IsoConnectionParameters
 IsoConnectionParameters_create()
 {
@@ -75,7 +74,13 @@ IsoConnectionParameters_create()
 void
 IsoConnectionParameters_destroy(IsoConnectionParameters self)
 {
-    GLOBAL_FREEMEM(self);
+    if (self)
+    {
+        if (self->localIpAddress)
+            GLOBAL_FREEMEM((void*)(self->localIpAddress));
+
+        GLOBAL_FREEMEM(self);
+    }
 }
 
 void
@@ -89,7 +94,6 @@ IsoConnectionParameters_setTlsConfiguration(IsoConnectionParameters self, TLSCon
 #endif
 }
 
-
 void
 IsoConnectionParameters_setAcseAuthenticationParameter(IsoConnectionParameters self,
         AcseAuthenticationParameter acseAuthParameter)