diff --git a/etiquette/objects.py b/etiquette/objects.py
index 07fc809..e4868d5 100644
--- a/etiquette/objects.py
+++ b/etiquette/objects.py
@@ -499,6 +499,8 @@ class Photo(ObjectBase):
         self.ratio = db_row['ratio']
         self.thumbnail = db_row['thumbnail']
 
+        if self.duration:
+            self.bitrate = (self.bytes / 128) / self.duration
         self.mimetype = helpers.get_mimetype(self.real_filepath)
         if self.mimetype is None:
             self.simple_mimetype = None
diff --git a/frontends/etiquette_flask/templates/photo.html b/frontends/etiquette_flask/templates/photo.html
index f22bdd6..8d50d16 100644
--- a/frontends/etiquette_flask/templates/photo.html
+++ b/frontends/etiquette_flask/templates/photo.html
@@ -183,7 +183,7 @@
         <li>Size: {{photo.bytestring()}}</li>
         {% if photo.duration %}
             <li>Duration: {{photo.duration_string}}</li>
-            <li>Overall Bitrate: {{((photo.bytes / 128) / photo.duration)|int}} kbps</li>
+            <li>Overall Bitrate: {{photo.bitrate|int}} kbps</li>
         {% endif %}
         <li><a href="/file/{{photo.id}}{{photo.dot_extension}}?download=true&original_filename=true">Download as original filename</a></li>
         <li><a href="/file/{{photo.id}}{{photo.dot_extension}}?download=true">Download as {{photo.id}}.{{photo.extension}}</a></li>