diff --git a/support/platform/src/pin/pin_core.c b/support/platform/src/pin/pin_core.c
index 6b41ebd7d5b00e754102a6331070f7a3ffa0d74b..86e594d5b8bf1772b7b93e784dbd2d90497e29f3 100644
--- a/support/platform/src/pin/pin_core.c
+++ b/support/platform/src/pin/pin_core.c
@@ -74,7 +74,9 @@ void PinCntlrRemove(struct PinCntlr *cntlr)
     }
 
     (void)PinCntlrListGet();
-    DListRemove(&cntlr->list);
+    if ((cntlr->list.next != NULL) && (cntlr->list.prev != NULL)) {
+        DListRemove(&cntlr->list);
+    }
     PinCntlrListPut();
     (void)OsalSpinDestroy(&cntlr->spin);
 }