diff --git a/deploy-board/deploy_board/templates/environs/env_hosts.html b/deploy-board/deploy_board/templates/environs/env_hosts.html
index f0ac232378..fc6d20ff4d 100644
--- a/deploy-board/deploy_board/templates/environs/env_hosts.html
+++ b/deploy-board/deploy_board/templates/environs/env_hosts.html
@@ -80,7 +80,7 @@ <h4 class="panel-title pull-left">{{ title }}</h4>
             <button type="button" class="btn btn-default btn-sm" data-toggle="modal" data-target="#showHosts" title="Show plain host names">
                 Show Hosts
             </button>
-            {% if title != "Failed Hosts" and show_protected_hosts is None %}
+            {% if title != "Failed Hosts" and show_protected_hosts === False %}
             <p><a href="/env/{{ env.envName }}/{{stage}}/hosts/?show_protected_hosts"> <button class="btn btn-primary" >Show protected hosts</button> </a></p>
             {% endif %}
         </div>
diff --git a/deploy-board/deploy_board/templates/hosts/hosts.tmpl b/deploy-board/deploy_board/templates/hosts/hosts.tmpl
index e581704ae6..c65f58ad88 100644
--- a/deploy-board/deploy_board/templates/hosts/hosts.tmpl
+++ b/deploy-board/deploy_board/templates/hosts/hosts.tmpl
@@ -44,7 +44,7 @@
               <th>StartDate(-08:00)</th>
               <th>LastUpdate</th>
               <th>ErrorCode</th>
-              {% if show_protection_status %}
+              {% if show_protected_hosts %}
               <th>ProtectionStatus</th>
               {% endif %}
           </tr>
@@ -60,7 +60,7 @@
                   <td>N/A</td>
                   <td>N/A</td>
                   <td>N/A</td>
-                  {% if show_protection_status %}
+                  {% if show_protected_hosts %}
                   <td>N/A</td>
                   {% endif %}
               {% elif agent.lastErrorCode|isProvisioningHost %}
@@ -73,7 +73,7 @@
                   <td>N/A</td>
                   <td>N/A</td>
                   <td>N/A</td>
-                  {% if show_protection_status %}
+                  {% if show_protected_hosts %}
                   <td>N/A</td>
                   {% endif %}
               {% else %}
@@ -86,7 +86,7 @@
                   <td>{{ agent.startDate|convertTimestamp }}</td>
                   <td>{{ agent.lastUpdateDate|convertTimestamp }}</td>
                   <td>{{ agent.lastErrorCode }}</td>
-                  {% if show_protection_status %}
+                  {% if show_protected_hosts %}
                   <td>
                     {% if agent.hostId in protected_hosts %}
                     Protected
diff --git a/deploy-board/deploy_board/webapp/env_views.py b/deploy-board/deploy_board/webapp/env_views.py
index f84192ade2..ce9b4eb238 100644
--- a/deploy-board/deploy_board/webapp/env_views.py
+++ b/deploy-board/deploy_board/webapp/env_views.py
@@ -1423,7 +1423,7 @@ def get_hosts(request, name, stage):
     title = "All hosts"
 
     agents_wrapper = {}
-    show_protected_hosts = request.GET.get("show_protected_hosts")
+    show_protected_hosts = request.GET.get("show_protected_hosts") is not None
     host_ids = []
     for agent in agents:
         if agent['deployId'] not in agents_wrapper: