diff --git a/models/namespace_rights.go b/models/namespace_rights.go
index a090a296663..97d7a3d95f3 100644
--- a/models/namespace_rights.go
+++ b/models/namespace_rights.go
@@ -67,8 +67,9 @@ func (n *Namespace) checkTeamRights(user *User, r TeamRight) bool {
 		Table("namespaces").
 		Join("LEFT", "team_namespaces", "namespaces.id = team_namespaces.namespace_id").
 		Join("LEFT", "team_members", "team_members.team_id = team_namespaces.team_id").
-		Where("team_members.user_id = ?  AND team_namespaces.right = ?", user.ID, r).
-		Or("namespaces.owner_id = ?", user.ID).
+		Where("namespaces.id = ? " +
+			"AND ((team_members.user_id = ?  AND team_namespaces.right = ?) " +
+			"OR namespaces.owner_id = ?)", n.ID, user.ID, r, user.ID).
 		Get(&Namespace{})
 
 	if err != nil {