diff --git a/repos/os/src/server/nic_router/list.h b/repos/os/src/server/nic_router/list.h
index d49bbebd08..1c8d1ae14b 100644
--- a/repos/os/src/server/nic_router/list.h
+++ b/repos/os/src/server/nic_router/list.h
@@ -29,10 +29,11 @@ struct Net::List : Genode::List<LT>
 	template <typename FUNC>
 	void for_each(FUNC && functor)
 	{
-		for (LT * elem = Base::first(); elem;
-		     elem = elem->Base::Element::next())
+		for (LT *elem = Base::first(); elem; )
 		{
+			LT *const next = elem->Base::Element::next();
 			functor(*elem);
+			elem = next;
 		}
 	}