diff --git a/endpoints/api.py b/endpoints/api.py
index f1a7e8869..0cad539b6 100644
--- a/endpoints/api.py
+++ b/endpoints/api.py
@@ -547,7 +547,7 @@ def prototype_view(proto, org_members):
       'name': user.username,
       'is_robot': user.robot,
       'kind': 'user',
-      'is_org_member': user.username in org_members,
+      'is_org_member': user.robot or user.username in org_members,
     }
 
   if proto.delegate_user: