diff --git a/src/system/kernel/fs/node_monitor.cpp b/src/system/kernel/fs/node_monitor.cpp
index d66534475a..ae5e66e05b 100644
--- a/src/system/kernel/fs/node_monitor.cpp
+++ b/src/system/kernel/fs/node_monitor.cpp
@@ -1247,6 +1247,12 @@ notify_query_attr_changed(port_id port, int32 token, dev_t device,
 //	#pragma mark - User syscalls
 
 
+// TODO: We should verify that the port specified in the syscalls does actually
+// belong to the calling team. The situation is complicated by the fact that a
+// port can be transferred to another team. Consequently we should remove all
+// associated monitor listeners when a port is transferred/deleted.
+
+
 status_t
 _user_stop_notifying(port_id port, uint32 token)
 {