diff --git a/atst/models/workspace.py b/atst/models/workspace.py
index 4e42b47c..be7c1ccf 100644
--- a/atst/models/workspace.py
+++ b/atst/models/workspace.py
@@ -31,7 +31,7 @@ class Workspace(Base, mixins.TimestampsMixin, mixins.AuditableMixin):
 
     @property
     def user_count(self):
-        return len(self.users)
+        return len(self.members)
 
     @property
     def legacy_task_order(self):
diff --git a/tests/domain/test_workspaces.py b/tests/domain/test_workspaces.py
index 61cb7b52..63b408d9 100644
--- a/tests/domain/test_workspaces.py
+++ b/tests/domain/test_workspaces.py
@@ -337,3 +337,14 @@ def test_disabled_members_dont_show_up(session):
 
     # should only return workspace owner and ACTIVE member
     assert len(workspace.members) == 2
+
+
+def test_does_not_count_disabled_members(session):
+    workspace = WorkspaceFactory.create()
+    WorkspaceRoleFactory.create(workspace=workspace, status=WorkspaceRoleStatus.ACTIVE)
+    WorkspaceRoleFactory.create(workspace=workspace)
+    WorkspaceRoleFactory.create(
+        workspace=workspace, status=WorkspaceRoleStatus.DISABLED
+    )
+
+    assert workspace.user_count == 3