diff --git a/ports/src/noux/rm_session_component.h b/ports/src/noux/rm_session_component.h
index 3335d018bd..5273bc6360 100644
--- a/ports/src/noux/rm_session_component.h
+++ b/ports/src/noux/rm_session_component.h
@@ -83,8 +83,8 @@ namespace Noux {
 
 			~Rm_session_component()
 			{
-				Region *curr = 0;
-				for (; curr; curr = curr->next())
+				Region *curr;
+				while ((curr = _regions.first()))
 					detach(curr->local_addr);
 			}