diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index ea9f6147ae292..1746bc69d6471 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -90,6 +90,7 @@ remove = Remove
 remove_all = Remove All
 remove_label_str = Remove item "%s"
 edit = Edit
+empty_file = Empty File
 
 enabled = Enabled
 disabled = Disabled
diff --git a/routers/web/repo/blame.go b/routers/web/repo/blame.go
index b1cb42297c1a6..600bad70f0f85 100644
--- a/routers/web/repo/blame.go
+++ b/routers/web/repo/blame.go
@@ -94,7 +94,6 @@ func RefBlame(ctx *context.Context) {
 	ctx.Data["FileName"] = blob.Name()
 
 	ctx.Data["NumLines"], err = blob.GetBlobLineCount()
-	ctx.Data["NumLinesSet"] = true
 
 	if err != nil {
 		ctx.NotFound("GetBlobLineCount", err)
diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go
index f0fe6140dfb8e..6a95e9901f7fa 100644
--- a/routers/web/repo/view.go
+++ b/routers/web/repo/view.go
@@ -463,6 +463,16 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st
 			ctx.Data["HasSourceRenderedToggle"] = true
 		}
 
+		buf, _ := io.ReadAll(rd)
+
+		// empty: 0 lines; "a": one line; "a\n": two lines; "a\nb": two lines;
+		// the NumLines is only used for the display on the UI: "xxx lines"
+		if len(buf) == 0 {
+			ctx.Data["NumLines"] = 0
+		} else {
+			ctx.Data["NumLines"] = bytes.Count(buf, []byte{'\n'}) + 1
+		}
+
 		if markupType != "" && !shouldRenderSource {
 			ctx.Data["IsMarkup"] = true
 			ctx.Data["MarkupType"] = markupType
@@ -486,17 +496,6 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st
 			// to prevent iframe load third-party url
 			ctx.Resp.Header().Add("Content-Security-Policy", "frame-src 'self'")
 		} else {
-			buf, _ := io.ReadAll(rd)
-
-			// empty: 0 lines; "a": one line; "a\n": two lines; "a\nb": two lines;
-			// the NumLines is only used for the display on the UI: "xxx lines"
-			if len(buf) == 0 {
-				ctx.Data["NumLines"] = 0
-			} else {
-				ctx.Data["NumLines"] = bytes.Count(buf, []byte{'\n'}) + 1
-			}
-			ctx.Data["NumLinesSet"] = true
-
 			language := ""
 
 			indexFilename, worktree, deleteTemporaryFile, err := ctx.Repo.GitRepo.ReadTreeToTemporaryIndex(ctx.Repo.CommitID)
diff --git a/templates/repo/blame.tmpl b/templates/repo/blame.tmpl
index b253c4d90143b..1fcf790d094c4 100644
--- a/templates/repo/blame.tmpl
+++ b/templates/repo/blame.tmpl
@@ -20,46 +20,50 @@
 		<div class="file-view code-view unicode-escaped">
 			<table>
 				<tbody>
-					{{range $row := .BlameRows}}
-						<tr class="{{if and (gt $.CommitCnt 1) ($row.CommitMessage)}}top-line-blame{{end}}">
-							<td class="lines-commit">
-								<div class="blame-info">
-									<div class="blame-data">
-										<div class="blame-avatar">
-											{{$row.Avatar}}
-										</div>
-										<div class="blame-message">
-											<a href="{{$row.CommitURL}}" title="{{$row.CommitMessage}}">
-												{{$row.CommitMessage}}
-											</a>
-										</div>
-										<div class="blame-time">
-											{{$row.CommitSince}}
+					{{if .BlameRows}}
+						{{range $row := .BlameRows}}
+							<tr class="{{if and (gt $.CommitCnt 1) ($row.CommitMessage)}}top-line-blame{{end}}">
+								<td class="lines-commit">
+									<div class="blame-info">
+										<div class="blame-data">
+											<div class="blame-avatar">
+												{{$row.Avatar}}
+											</div>
+											<div class="blame-message">
+												<a href="{{$row.CommitURL}}" title="{{$row.CommitMessage}}">
+													{{$row.CommitMessage}}
+												</a>
+											</div>
+											<div class="blame-time">
+												{{$row.CommitSince}}
+											</div>
 										</div>
 									</div>
-								</div>
-							</td>
-							<td class="lines-blame-btn">
-								{{if $row.PreviousSha}}
-									<a href="{{$row.PreviousShaURL}}" data-tooltip-content='{{$.locale.Tr "repo.blame_prior"}}'>
-										{{svg "octicon-versions"}}
-									</a>
-								{{end}}
-							</td>
-							<td class="lines-num">
-								<span id="L{{$row.RowNumber}}" data-line-number="{{$row.RowNumber}}"></span>
-							</td>
-							{{if $.EscapeStatus.Escaped}}
-								<td class="lines-escape">
-									{{if $row.EscapeStatus.Escaped}}
-										<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $row "locale" $.locale}}"></button>
+								</td>
+								<td class="lines-blame-btn">
+									{{if $row.PreviousSha}}
+										<a href="{{$row.PreviousShaURL}}" data-tooltip-content='{{$.locale.Tr "repo.blame_prior"}}'>
+											{{svg "octicon-versions"}}
+										</a>
 									{{end}}
 								</td>
-							{{end}}
-							<td rel="L{{$row.RowNumber}}" class="lines-code blame-code chroma">
-								<code class="code-inner gt-pl-3">{{$row.Code}}</code>
-							</td>
-						</tr>
+								<td class="lines-num">
+									<span id="L{{$row.RowNumber}}" data-line-number="{{$row.RowNumber}}"></span>
+								</td>
+								{{if $.EscapeStatus.Escaped}}
+									<td class="lines-escape">
+										{{if $row.EscapeStatus.Escaped}}
+											<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $row "locale" $.locale}}"></button>
+										{{end}}
+									</td>
+								{{end}}
+								<td rel="L{{$row.RowNumber}}" class="lines-code blame-code chroma">
+									<code class="code-inner gt-pl-3">{{$row.Code}}</code>
+								</td>
+							</tr>
+						{{end}}
+					{{else}}
+						<div class="gt-df gt-jc gt-py-4">{{.locale.Tr "empty_file"}}</div>
 					{{end}}
 				</tbody>
 			</table>
diff --git a/templates/repo/file_info.tmpl b/templates/repo/file_info.tmpl
index 7323b30d77b53..4fe15d43fce9a 100644
--- a/templates/repo/file_info.tmpl
+++ b/templates/repo/file_info.tmpl
@@ -4,12 +4,12 @@
 			{{.locale.Tr "repo.symbolic_link"}}
 		</div>
 	{{end}}
-	{{if .NumLinesSet}}{{/* Explicit attribute needed to show 0 line changes */}}
+	{{if not (eq .NumLines nil)}}
 		<div class="file-info-entry">
 			{{.NumLines}} {{.locale.TrN .NumLines "repo.line" "repo.lines"}}
 		</div>
 	{{end}}
-	{{if .FileSize}}
+	{{if not (eq .FileSize nil)}}
 		<div class="file-info-entry">
 			{{FileSize .FileSize}}{{if .IsLFSFile}} ({{.locale.Tr "repo.stored_lfs"}}){{end}}
 		</div>
diff --git a/templates/repo/settings/lfs_file.tmpl b/templates/repo/settings/lfs_file.tmpl
index de6f0100f86e1..36dd1d7f7e971 100644
--- a/templates/repo/settings/lfs_file.tmpl
+++ b/templates/repo/settings/lfs_file.tmpl
@@ -15,9 +15,17 @@
 				{{template "repo/unicode_escape_prompt" dict "EscapeStatus" .EscapeStatus "root" $}}
 				<div class="file-view{{if .IsMarkup}} markup {{.MarkupType}}{{else if .IsPlainText}} plain-text{{else if .IsTextFile}} code-view{{end}}">
 					{{if .IsMarkup}}
-						{{if .FileContent}}{{.FileContent | Safe}}{{end}}
+						{{if .FileContent}}
+							{{.FileContent | Safe}}
+						{{else}}
+							<div class="gt-df gt-jc">{{.locale.Tr "empty_file"}}</div>
+						{{end}}
 					{{else if .IsPlainText}}
-						<pre>{{if .FileContent}}{{.FileContent | Safe}}{{end}}</pre>
+						{{if .FileContent}}
+							<pre>{{.FileContent | Safe}}</pre>
+						{{else}}
+							<div class="gt-df gt-jc">{{.locale.Tr "empty_file"}}</div>
+						{{end}}
 					{{else if not .IsTextFile}}
 						<div class="view-raw">
 							{{if .IsImageFile}}
@@ -49,6 +57,8 @@
 								</tr>
 							</tbody>
 						</table>
+					{{else if not .FileSize}}
+						<div class="gt-df gt-jc gt-py-4">{{.locale.Tr "empty_file"}}</div>
 					{{end}}
 				</div>
 			</div>
diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl
index 0882ff4b27462..15d8ca0f40084 100644
--- a/templates/repo/view_file.tmpl
+++ b/templates/repo/view_file.tmpl
@@ -69,9 +69,17 @@
 		{{end}}
 		<div class="file-view{{if .IsMarkup}} markup {{.MarkupType}}{{else if .IsPlainText}} plain-text{{else if .IsTextSource}} code-view{{end}}">
 			{{if .IsMarkup}}
-				{{if .FileContent}}{{.FileContent | Safe}}{{end}}
+				{{if .FileContent}}
+					{{.FileContent | Safe}}
+				{{else}}
+					<div class="gt-df gt-jc">{{.locale.Tr "empty_file"}}</div>
+				{{end}}
 			{{else if .IsPlainText}}
-				<pre>{{if .FileContent}}{{.FileContent | Safe}}{{end}}</pre>
+				{{if .FileContent}}
+					<pre>{{.FileContent | Safe}}</pre>
+				{{else}}
+					<div class="gt-df gt-jc">{{.locale.Tr "empty_file"}}</div>
+				{{end}}
 			{{else if not .IsTextSource}}
 				<div class="view-raw">
 					{{if .IsImageFile}}
@@ -122,6 +130,8 @@
 					<a class="item copy-line-permalink" data-url="{{.Repository.Link}}/src/commit/{{PathEscape .CommitID}}/{{PathEscapeSegments .TreePath}}{{if $.HasSourceRenderedToggle}}?display=source{{end}}">{{.locale.Tr "repo.file_copy_permalink"}}</a>
 				</div>
 				{{end}}
+			{{else if not .FileSize}}
+				<div class="gt-df gt-jc gt-py-4">{{.locale.Tr "empty_file"}}</div>
 			{{end}}
 		</div>
 	</div>