diff --git a/ogcp/templates/base.html b/ogcp/templates/base.html
index 5d46135..e924fe1 100644
--- a/ogcp/templates/base.html
+++ b/ogcp/templates/base.html
@@ -76,7 +76,7 @@
             {% block container %}
             <div class="row h-100">
                     {# The sidebar is not visible on index and login #}
-                    {% if request.endpoint not in ["index", "login"] %}
+                    {% if request.endpoint not in ["index", "login", "client_list"] %}
                         <div id="sidebar" class="bg-light col-md-3 col-lg-3">
                             {% block sidebar %}{% endblock %}
                         </div>
diff --git a/ogcp/templates/client_list.html b/ogcp/templates/client_list.html
index cd07118..8a3fd5b 100644
--- a/ogcp/templates/client_list.html
+++ b/ogcp/templates/client_list.html
@@ -1,6 +1,5 @@
-{% extends 'commands.html' %}
+{% extends 'base.html' %}
 
-{% set sidebar_state = 'disabled' %}
 {% set btn_back = true %}
 
 {% block content %}