diff --git a/app/views/paginable/templates/_all.html.erb b/app/views/paginable/templates/_all.html.erb
index 1a4dabd..a80b466 100644
--- a/app/views/paginable/templates/_all.html.erb
+++ b/app/views/paginable/templates/_all.html.erb
@@ -31,12 +31,12 @@
             <%= template.org.name %>
           </td>
           <td>
-            <% if !published[template.dmptemplate_id].present? %>
-              <%= _('Unpublished') %>
-            <% elsif template.dirty? %>
+            <% if template.dirty? %>
               <%= _('Unpublished changes') %>
-            <% else %>
+            <% elsif template.published? %>
               <%= _('Published') %>
+            <% else %>
+              <%= _('Unpublished') %>
             <% end %>
           </td>
           <td>
diff --git a/app/views/paginable/templates/_orgs.html.erb b/app/views/paginable/templates/_orgs.html.erb
index 6adab77..2663db1 100644
--- a/app/views/paginable/templates/_orgs.html.erb
+++ b/app/views/paginable/templates/_orgs.html.erb
@@ -30,12 +30,12 @@
             <%= raw(template.description) %>
           </td>
           <td>
-            <% if !published[template.dmptemplate_id].present? %>
-              <%= _('Unpublished') %>
-            <% elsif template.dirty? %>
+            <% if template.dirty? %>
               <%= _('Unpublished changes') %>
-            <% else %>
+            <% elsif template.published? %>
               <%= _('Published') %>
+            <% else %>
+              <%= _('Unpublished') %>
             <% end %>
           </td>
           <td>