diff --git a/website/concatenate.py b/website/concatenate.py
index 3ef81f7..0ee2874 100644
--- a/website/concatenate.py
+++ b/website/concatenate.py
@@ -108,7 +108,7 @@ def resolve_segment_offset(segment_offset=max(VIEW_COUNTING_PERIOD // HLS_TIME,
     try:
         segment = segments[-min(segment_offset, len(segments))]
     except IndexError:
-        return None
+        return 0
     return _segment_number(segment)
 
 def get_next_segment(after, start_segment):
@@ -242,4 +242,4 @@ class ConcatenatedSegments:
             return b''
 
     def close(self):
-        self._closed = True
+        self._closed = True
\ No newline at end of file
diff --git a/website/routes.py b/website/routes.py
index c2b4a7a..15a2880 100644
--- a/website/routes.py
+++ b/website/routes.py
@@ -126,11 +126,7 @@ def segments():
     except KeyError:
         pass
 
-    start_number = request.args.get('segment', type=int)
-    if start_number == None:
-        start_number = resolve_segment_offset()
-        if start_number == None:
-            start_number = 0
+    start_number = request.args.get('segment', type=int) or resolve_segment_offset()
 
     try:
         concatenated_segments = ConcatenatedSegments(start_number=start_number,
@@ -331,4 +327,4 @@ def add_header(response):
 
 @current_app.route('/teapot')
 def teapot():
-    return {'short': True, 'stout': True}, 418
+    return {'short': True, 'stout': True}, 418
\ No newline at end of file
diff --git a/website/templates/index.html b/website/templates/index.html
index 2acbad3..a52c41c 100644
--- a/website/templates/index.html
+++ b/website/templates/index.html
@@ -55,11 +55,11 @@
                         <source src="{{ url_for('playlist', token=token) }}" type="application/x-mpegURL">
                     </video>
                     <noscript>
-                        <video style="width: 100%;height: 100%;" controls autoplay src="{{ url_for('segments') }}?{% if start_number != None %}segment={{ start_number }}&{% endif %}token={{ token }}">
+                        <video style="width: 100%;height: 100%;" controls autoplay src="{{ url_for('segments') }}?segment={{ start_number }}&token={{ token }}">
                     </noscript>
                     {% else %}
                     <input id="videojs-enabled" type="hidden" value="0">
-                    <video style="width: 100%;height: 100%;" controls autoplay src="{{ url_for('segments') }}?{% if start_number != None %}segment={{ start_number }}&{% endif %}token={{ token }}">
+                    <video style="width: 100%;height: 100%;" controls autoplay src="{{ url_for('segments') }}?segment={{ start_number }}&token={{ token }}">
                     {% endif %}
                 </div>
                 <div id="stream-info-container"><noscript><iframe id="stream-info" src="{{ url_for('stream_info') }}?token={{ token }}&embed=1"></iframe></noscript></div>