diff --git a/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs b/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs
index 5e125a7..7cad7c4 100644
--- a/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs
+++ b/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs
@@ -167,7 +167,17 @@
                   </a>
                 {{/if}}
               </td>
-              <td class="query-created-at"><medium>{{bound-date query.last_run_at}}</medium></td>
+              <td class="query-created-at">
+                {{#if query.last_run_at}}  
+                  <medium>
+                    {{bound-date query.last_run_at}}
+                  </medium>
+                {{else}}
+                  <medium>
+                    {{bound-date query.created_at}}
+                  </medium>
+                {{/if}}
+              </td>
             </tr>
           {{/each}}
         </table>