diff --git a/evennia/web/website/templates/website/channel_list.html b/evennia/web/website/templates/website/channel_list.html
index a8c91338ae..3fda972479 100644
--- a/evennia/web/website/templates/website/channel_list.html
+++ b/evennia/web/website/templates/website/channel_list.html
@@ -39,6 +39,10 @@
                       <td>{{ object.db.desc }}</td>
                       <td>{{ object.subscriptions.all|length }}</td>
                     </tr>
+                    {% empty %}
+                    <tr>
+                      <td colspan="3">No channels were found!</td>
+                    </tr>
                     {% endfor %}
                   </tbody>
                 </table>
@@ -56,6 +60,7 @@
             <hr />
             {% endif %}
           
+            {% if most_popular %}
             <div class="card mb-3">
               <div class="card-header">Most Popular</div>
               
@@ -66,13 +71,14 @@
               </ul>
               
             </div>
+            {% endif %}
           
           </div>
           <!-- end right column -->
             
         </div>
         
-
+      <hr />
       </div>
     </div>
   </div>