diff --git a/atst/domain/workspace_roles.py b/atst/domain/workspace_roles.py
index eba673c4..38763e4c 100644
--- a/atst/domain/workspace_roles.py
+++ b/atst/domain/workspace_roles.py
@@ -36,16 +36,9 @@ class WorkspaceRoles(object):
     @classmethod
     def get_by_id(cls, id_):
         try:
-            workspace_role = (
-                db.session.query(WorkspaceRole)
-                .join(User)
-                .filter(WorkspaceRole.id == id_)
-                .one()
-            )
+            return db.session.query(WorkspaceRole).filter(WorkspaceRole.id == id_).one()
         except NoResultFound:
-            workspace_role = None
-
-        return workspace_role
+            raise NotFoundError("workspace_role")
 
     @classmethod
     def _get_active_workspace_role(cls, workspace_id, user_id):