diff --git a/app/views/organizations/teams/_detail.json.jbuilder b/app/views/organizations/teams/_detail.json.jbuilder
index cb0507b5a..68572814f 100644
--- a/app/views/organizations/teams/_detail.json.jbuilder
+++ b/app/views/organizations/teams/_detail.json.jbuilder
@@ -1,6 +1,6 @@
 json.id team.id
 json.name team.name
-json.nickname team.nickname
+json.nickname team.nickname.blank? ? team.name : team.nickname
 json.description team.description
 json.authorize team.authorize
 json.includes_all_project team.includes_all_project