diff --git a/resources/templates/recent_favorite_table_favorite.twig b/resources/templates/recent_favorite_table_favorite.twig
index 4324ce359e..09d578960d 100644
--- a/resources/templates/recent_favorite_table_favorite.twig
+++ b/resources/templates/recent_favorite_table_favorite.twig
@@ -1,15 +1,19 @@
-{% for table in tables %}
-<li class="warp_link">
-  <a
-    class="ajax favorite_table_anchor"
-    href="{{ url('/database/structure/favorite-table', table.remove_parameters) }}"
-    title="{% trans 'Remove from Favorites' %}"
-    data-favtargetn="{{ table.table_parameters.md5 }}"
-  >
-    {{ get_icon('b_favorite') }}
-  </a>
-  <a class="disableAjax" href="{{ url('/table/recent-favorite', table.table_parameters) }}">
-    `{{ table.table_parameters.db }}`.`{{ table.table_parameters.table }}`
-  </a>
-</li>
-{% endfor %}
+{% if tables is empty %}
+  {{ 'There are no favorite tables.'|trans }}
+{% else %}
+  {% for table in tables %}
+  <li class="warp_link">
+    <a
+      class="ajax favorite_table_anchor"
+      href="{{ url('/database/structure/favorite-table', table.remove_parameters) }}"
+      title="{% trans 'Remove from Favorites' %}"
+      data-favtargetn="{{ table.table_parameters.md5 }}"
+    >
+      {{ get_icon('b_favorite') }}
+    </a>
+    <a class="disableAjax" href="{{ url('/table/recent-favorite', table.table_parameters) }}">
+      `{{ table.table_parameters.db }}`.`{{ table.table_parameters.table }}`
+    </a>
+  </li>
+  {% endfor %}
+{% endif %}
diff --git a/resources/templates/recent_favorite_table_no_tables.twig b/resources/templates/recent_favorite_table_no_tables.twig
deleted file mode 100644
index 114816dd81..0000000000
--- a/resources/templates/recent_favorite_table_no_tables.twig
+++ /dev/null
@@ -1,7 +0,0 @@
-<li class="warp_link">
-    {% if is_recent %}
-        {% trans 'There are no recent tables.' %}
-    {% else %}
-        {% trans 'There are no favorite tables.' %}
-    {% endif %}
-</li>
diff --git a/resources/templates/recent_favorite_table_recent.twig b/resources/templates/recent_favorite_table_recent.twig
index 5fa02f4a56..e3c2ae49b4 100644
--- a/resources/templates/recent_favorite_table_recent.twig
+++ b/resources/templates/recent_favorite_table_recent.twig
@@ -1,7 +1,11 @@
-{% for table in tables %}
-<li class="warp_link">
-  <a class="disableAjax" href="{{ url('/table/recent-favorite', table) }}">
-    `{{ table.db }}`.`{{ table.table }}`
-  </a>
-</li>
-{% endfor %}
+{% if tables is empty %}
+  {{ 'There are no recent tables.'|trans }}
+{% else %}
+  {% for table in tables %}
+  <li class="warp_link">
+    <a class="disableAjax" href="{{ url('/table/recent-favorite', table) }}">
+      `{{ table.db }}`.`{{ table.table }}`
+    </a>
+  </li>
+  {% endfor %}
+{% endif %}
diff --git a/src/Favorites/RecentFavoriteTables.php b/src/Favorites/RecentFavoriteTables.php
index 1dede713b4..89f69d490c 100644
--- a/src/Favorites/RecentFavoriteTables.php
+++ b/src/Favorites/RecentFavoriteTables.php
@@ -189,39 +189,33 @@ class RecentFavoriteTables
      */
     public function getHtmlList(): string
     {
-        if ($this->tables !== []) {
-            if ($this->tableType === TableType::Recent) {
-                $tables = [];
-                foreach ($this->tables as $table) {
-                    $tables[] = $table->toArray();
-                }
-
-                return $this->template->render('recent_favorite_table_recent', ['tables' => $tables]);
-            }
-
+        if ($this->tableType === TableType::Recent) {
             $tables = [];
             foreach ($this->tables as $table) {
-                $removeParameters = [
-                    'db' => $table->db->getName(),
-                    'favorite_table' => $table->table->getName(),
-                    'ajax_request' => true,
-                    'remove_favorite' => true,
-                ];
-                $tableParameters = [
-                    'db' => $table->db->getName(),
-                    'table' => $table->table->getName(),
-                    'md5' => md5($table->db . '.' . $table->table),
-                ];
-
-                $tables[] = ['remove_parameters' => $removeParameters, 'table_parameters' => $tableParameters];
+                $tables[] = $table->toArray();
             }
 
-            return $this->template->render('recent_favorite_table_favorite', ['tables' => $tables]);
+            return $this->template->render('recent_favorite_table_recent', ['tables' => $tables]);
         }
 
-        return $this->template->render('recent_favorite_table_no_tables', [
-            'is_recent' => $this->tableType === TableType::Recent,
-        ]);
+        $tables = [];
+        foreach ($this->tables as $table) {
+            $removeParameters = [
+                'db' => $table->db->getName(),
+                'favorite_table' => $table->table->getName(),
+                'ajax_request' => true,
+                'remove_favorite' => true,
+            ];
+            $tableParameters = [
+                'db' => $table->db->getName(),
+                'table' => $table->table->getName(),
+                'md5' => md5($table->db . '.' . $table->table),
+            ];
+
+            $tables[] = ['remove_parameters' => $removeParameters, 'table_parameters' => $tableParameters];
+        }
+
+        return $this->template->render('recent_favorite_table_favorite', ['tables' => $tables]);
     }
 
     /**