diff --git a/pagure/templates/file.html b/pagure/templates/file.html
index c2c6595..8fa38a1 100644
--- a/pagure/templates/file.html
+++ b/pagure/templates/file.html
@@ -159,9 +159,14 @@
         {% endif %}
 
     {% if output_type=='file' %}
-        {% autoescape false %}
-        {{ content | format_loc }}
-        {% endautoescape %}
+        {% if content.size != 0 %}
+            {% autoescape false %}
+            {{ content | format_loc }}
+            {% endautoescape %}
+        {% else %}
+            <p> No content in the file </p>
+        {% endif %}
+
     {% elif output_type == 'markup' %}
         <div class="m-a-2">
         {% autoescape false %}
diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py
index c51e195..2c0e990 100644
--- a/pagure/ui/repo.py
+++ b/pagure/ui/repo.py
@@ -476,7 +476,6 @@ def view_file(repo, identifier, filename, username=None, namespace=None):
     """ Displays the content of a file or a tree for the specified repo.
     """
     repo = flask.g.repo
-    reponame = flask.g.reponame
     repo_obj = flask.g.repo_obj
 
     if repo_obj.is_empty:
@@ -512,7 +511,6 @@ def view_file(repo, identifier, filename, username=None, namespace=None):
     if not content:
         flask.abort(404, 'File not found')
 
-    encoding = None
     readme = None
     safe = False
     readme_ext = None
@@ -566,6 +564,8 @@ def view_file(repo, identifier, filename, username=None, namespace=None):
                         style=style,)
                 )
                 output_type = 'file'
+            else:
+                output_type = 'file'
         else:
             output_type = 'binary'
     else: