diff --git a/administrator/components/com_templates/src/Model/TemplateModel.php b/administrator/components/com_templates/src/Model/TemplateModel.php
index 97b02b530fee6..953d7ab224f05 100644
--- a/administrator/components/com_templates/src/Model/TemplateModel.php
+++ b/administrator/components/com_templates/src/Model/TemplateModel.php
@@ -181,16 +181,23 @@ public function getUpdatedList($state = false, $all = false, $cleanup = false)
 
         $template = $this->getTemplate();
 
-        $query->from($db->quoteName('#__template_overrides', 'a'));
+        $query->from($db->quoteName('#__template_overrides', 'a'))
+            ->join(
+                'INNER',
+                $db->quoteName('#__extensions', 'e')
+                . ' ON ' . $db->quoteName('e.extension_id') . ' = ' . $db->quoteName('a.extension_id')
+            )
+            ->where($db->quoteName('e.enabled') . ' = 1')
+            ->where($db->quoteName('e.type') . ' = ' . $db->quote('template'));
 
         if (!$all) {
             $teid = (int) $template->extension_id;
-            $query->where($db->quoteName('extension_id') . ' = :teid')
+            $query->where($db->quoteName('a.extension_id') . ' = :teid')
                 ->bind(':teid', $teid, ParameterType::INTEGER);
         }
 
         if ($state) {
-            $query->where($db->quoteName('state') . ' = 0');
+            $query->where($db->quoteName('a.state') . ' = 0');
         }
 
         $query->order($db->quoteName('a.modified_date') . ' DESC');