diff --git a/support/platform/src/pin/pin_core.c b/support/platform/src/pin/pin_core.c
index 09e65ba6ad6bc2431f58bf29b573e1bae672e547..60300b51d6c79f4447db90f130ecce0a701069d2 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) {
+        DListRemove(&cntlr->list);
+    }
     PinCntlrListPut();
     (void)OsalSpinDestroy(&cntlr->spin);
 }