diff --git a/src/caosdb/common/models.py b/src/caosdb/common/models.py
index be0497f22dce813e20e7cda3bea3c6e7e770796f..eb4f4d216606101f0e6dd4cebf5b7a665e57a273 100644
--- a/src/caosdb/common/models.py
+++ b/src/caosdb/common/models.py
@@ -1039,6 +1039,8 @@ class Entity(object):
 
                 return c[0]
             else:
+                # TODO: This has to be chnaged once ambiguous
+                # retrievals are delat with server-side.
                 raise QueryNotUniqueError("This retrieval was not unique!!!")
         else:
             return Container().append(self).retrieve(