diff --git a/atst/models/workspace.py b/atst/models/workspace.py
index f88ea7a0..0b36a7b6 100644
--- a/atst/models/workspace.py
+++ b/atst/models/workspace.py
@@ -18,7 +18,14 @@ class Workspace(Base, TimestampsMixin):
 
     @property
     def owner(self):
-        return self.request.creator
+        return next(
+            (
+                workspace_role.user
+                for workspace_role in self.roles
+                if workspace_role.role.name == "owner"
+            ),
+            None,
+        )
 
     @property
     def users(self):