diff --git a/src/objects/models.py b/src/objects/models.py
index a063b256ec..b0e2773269 100644
--- a/src/objects/models.py
+++ b/src/objects/models.py
@@ -606,7 +606,7 @@ class ObjectDB(TypedObject):
         if searchdata == _HERE:
             return self.location
         if searchdata in (_ME, _SELF):
-            return self
+            return self.typeclass
 
         if use_nicks:
             nick = None