diff --git a/data/model/service_keys.py b/data/model/service_keys.py
index 82a3cdcb6..4cfc30764 100644
--- a/data/model/service_keys.py
+++ b/data/model/service_keys.py
@@ -111,7 +111,7 @@ def approve_service_key(kid, approver, approval_type):
 
 
 def _list_service_keys_query(kid=None, service=None, approved_only=False):
-  query = ServiceKey.select()
+  query = ServiceKey.select().join(ServiceKeyApproval)
 
   if approved_only:
     query = query.where(~(ServiceKey.approval >> None))
@@ -122,7 +122,7 @@ def _list_service_keys_query(kid=None, service=None, approved_only=False):
                         ~(_stale_unapproved_keys_clause(service)))
 
   if kid is not None:
-    query.where(ServiceKey.kid == kid)
+    query = query.where(ServiceKey.kid == kid)
 
   return query