diff --git a/src/iec61850/server/mms_mapping/mms_mapping.c b/src/iec61850/server/mms_mapping/mms_mapping.c
index ca043c49..75a0031f 100644
--- a/src/iec61850/server/mms_mapping/mms_mapping.c
+++ b/src/iec61850/server/mms_mapping/mms_mapping.c
@@ -2362,8 +2362,7 @@ unselectControlsForConnection(MmsMapping* self, MmsServerConnection connection)
     while (controlObjectElement != NULL) {
         ControlObject* controlObject = (ControlObject*) controlObjectElement->data;
 
-        if (ControlObject_unselect(controlObject, connection))
-            break;
+        ControlObject_unselect(controlObject, connection);
 
         controlObjectElement = LinkedList_getNext(controlObjectElement);
     }