diff --git a/src/intrusive_links.h b/src/intrusive_links.h
index 6bfbfbbc..c63de971 100644
--- a/src/intrusive_links.h
+++ b/src/intrusive_links.h
@@ -289,12 +289,13 @@ namespace etl
   {
     if (node.etl_next != nullptr)
     {
-      node.etl_next = node.etl_next->etl_next;
+      TLink* old_next = node.etl_next;
+      node.etl_next = old_next->etl_next;
 
       if ((int(TLink::OPTION) == etl::link_option::AUTO) ||
           (int(TLink::OPTION) == etl::link_option::CHECKED))
       {
-        node.clear();
+        old_next.clear();
       }
     }
   }