diff --git a/a5/templates/block/measurements.html.j2 b/a5/templates/block/measurements.html.j2
index ad0c8ce..9fb0fc8 100644
--- a/a5/templates/block/measurements.html.j2
+++ b/a5/templates/block/measurements.html.j2
@@ -1,4 +1,4 @@
-<div hx-get="/measurements?htmx" hx-trigger="every 2s" hx-target="main"></div>
+<div hx-get="/measurements?page={{page}}&htmx" hx-trigger="every 2s" hx-target="main"></div>
 
 <h1>Measurements</h1>
 <p>Page {{page}}</p>
@@ -21,10 +21,10 @@
 
 <div>
     {% if page > 1 %}
-        <a href="/measurements?page={{page-1}}" hx-get="/measurements?page={{page-1}}&htmx" hx-target="main" class="btn btn-link">Previous page</a>
+        <a href="/measurements?page={{page-1}}" hx-replace-url="/measurements?page={{page-1}}" hx-get="/measurements?page={{page-1}}&htmx" hx-target="main" class="btn btn-link">Previous page</a>
     {% endif %}
     {% if has_next_page %}
-        <a href="/measurements?page={{page+1}}" hx-get="/measurements?page={{page+1}}&htmx" hx-target="main" class="btn btn-link">Next page</a>
+        <a href="/measurements?page={{page+1}}" hx-replace-url="/measurements?page={{page+1}}" hx-get="/measurements?page={{page+1}}&htmx" hx-target="main" class="btn btn-link">Next page</a>
     {% endif %}
 
     <a href="/" class="btn btn-link">View statistics</a>