diff --git a/app/templates/index.html b/app/templates/index.html
index 66b6301..df6044e 100644
--- a/app/templates/index.html
+++ b/app/templates/index.html
@@ -45,8 +45,10 @@
     </div>
     {% endfor %}
 </div>
+{% if has_more %}
 <div id="scroll-sentinel" style="height:1px"></div>
 <div id="scroll-loading" style="text-align:center;padding:1rem;color:var(--text-muted);display:none">⏳</div>
+{% endif %}
 {% else %}
 <div class="empty-state">
     <p>{{ 'index.empty'|t(lang) }}</p>
diff --git a/app/templates/showcase.html b/app/templates/showcase.html
index 44d8903..2a562d8 100644
--- a/app/templates/showcase.html
+++ b/app/templates/showcase.html
@@ -86,8 +86,10 @@
     {% endif %}
     {% endfor %}
 {% endif %}
+{% if sent_visible|length > 19 %}
 <div id="scroll-sentinel-sent" style="height:1px"></div>
 <div id="scroll-loading-sent" style="text-align:center;padding:1rem;color:var(--text-muted);display:none">⏳</div>
+{% endif %}
 </div>
 
 <div id="tab-received" class="tab-panel" style="display:none">
@@ -135,8 +137,10 @@
     {% endif %}
     {% endfor %}
 {% endif %}
+{% if received_visible|length > 19 %}
 <div id="scroll-sentinel-received" style="height:1px"></div>
 <div id="scroll-loading-received" style="text-align:center;padding:1rem;color:var(--text-muted);display:none">⏳</div>
+{% endif %}
 </div>
 {% endif %}