diff --git a/integrations/repo_test.go b/integrations/repo_test.go
index 165009faa2..36672ff62a 100644
--- a/integrations/repo_test.go
+++ b/integrations/repo_test.go
@@ -99,3 +99,23 @@ func TestViewRepoWithSymlinks(t *testing.T) {
 	assert.Equal(t, items[3], "link_hi: octicon octicon-file-symlink-file")
 	assert.Equal(t, items[4], "link_link: octicon octicon-file-symlink-file")
 }
+
+// TestViewAsRepoAdmin tests PR #2167
+func TestViewAsRepoAdmin(t *testing.T) {
+	for user, expectedNoDescription := range map[string]bool{
+		"user2": true,
+		"user3": false,
+	} {
+		prepareTestEnv(t)
+
+		session := loginUser(t, user)
+
+		req := NewRequest(t, "GET", "/user2/repo1.git")
+		resp := session.MakeRequest(t, req, http.StatusOK)
+
+		htmlDoc := NewHTMLParser(t, resp.Body)
+		noDescription := htmlDoc.doc.Find("#repo-desc").Children()
+
+		assert.Equal(t, expectedNoDescription, noDescription.HasClass("no-description"))
+	}
+}
diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl
index 5e07f0f39d..13101827ec 100644
--- a/templates/repo/home.tmpl
+++ b/templates/repo/home.tmpl
@@ -5,7 +5,7 @@
 		{{template "base/alert" .}}
 		<div class="ui repo-description">
 			<div id="repo-desc">
-				{{if .Repository.DescriptionHTML}}<span class="description has-emoji">{{.Repository.DescriptionHTML}}</span>{{else}}<span class="no-description text-italic">{{.i18n.Tr "repo.no_desc"}}</span>{{end}}
+				{{if .Repository.DescriptionHTML}}<span class="description has-emoji">{{.Repository.DescriptionHTML}}</span>{{else if .IsRepositoryAdmin}}<span class="no-description text-italic">{{.i18n.Tr "repo.no_desc"}}</span>{{end}}
 				<a class="link" href="{{.Repository.Website}}">{{.Repository.Website}}</a>
 			</div>
 			{{if .RepoSearchEnabled}}