diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/_MyFrameworks.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/_MyFrameworks.cshtml
index a9922cef87..ba2f6e53b2 100644
--- a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/_MyFrameworks.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/_MyFrameworks.cshtml
@@ -14,72 +14,77 @@
     <partial name="SearchablePage/_SearchResultsCount" model="Model" />
     <partial name="SearchablePage/_TopPagination" model="Model" />
     <partial name="SearchablePage/_ResultCountAndPageAlerts" model="Model" />
-
-    <table role="table" class="nhsuk-table-responsive">
-      <caption class="nhsuk-table__caption nhsuk-u-visually-hidden">Frameworks you are working on</caption>
-      <thead role="rowgroup" class="nhsuk-table__head">
-      <tr role="row">
-        <th role="columnheader" class="" scope="col">
-          Framework
-        </th>
-        <th role="columnheader" class="" scope="col">
-          Created
-        </th>
-        <th role="columnheader" class="" scope="col">
-          Status
-        </th>
-        <th role="columnheader" class="" scope="col">
-          Owner
-        </th>
-        <th role="columnheader" class="" scope="col">
-          Actions
-        </th>
-      </tr>
-      </thead>
-      <tbody class="nhsuk-table__body">
-      @foreach (var framework in Model.BrandedFrameworks) {
-        <tr role="row" class="nhsuk-table__row framework-row">
-          <td role="cell" class="nhsuk-table__cell">
-            <span class="nhsuk-table-responsive__heading">Framework </span>
-            <span class="framework-name">
-              @framework.FrameworkName
-            </span>
-          </td>
-          <td role="cell" class="nhsuk-table__cell">
-            <span class="nhsuk-table-responsive__heading">Created </span>
-            <span class="framework-created-date">
-              @framework.CreatedDate.ToShortDateString()
-            </span>
-          </td>
-          <td role="cell" class="nhsuk-table__cell">
-            <span class="nhsuk-table-responsive__heading">Status </span>
-            <span class="framework-publish-status">
-              <partial name="Shared/_StatusTag" model="framework.PublishStatusID" />
-            </span>
-          </td>
-          <td role="cell" class="nhsuk-table__cell">
-            <span class="nhsuk-table-responsive__heading">Owner </span>
-            <span class="framework-owner">
-              @framework.Owner
-            </span>
-          </td>
-          <td role="cell" class="nhsuk-table__cell">
-            <span class="nhsuk-table-responsive__heading">Actions </span>
-            @if (framework.UserRole > 1) {
-              <a asp-action="ViewFramework" asp-route-frameworkId="@framework.ID" asp-route-tabname="Structure">
-                View/Edit
-              </a>
-            } else if (framework.UserRole == 1) {
-              <a asp-action="ViewFramework" asp-route-frameworkId="@framework.ID" asp-route-tabname="Structure">
-                Review
-              </a>
-            }
-          </td>
-        </tr>
-      }
-      </tbody>
-    </table>
-
+    @if (Model.MatchingSearchResults > 0)
+    {
+      <table role="table" class="nhsuk-table-responsive">
+        <caption class="nhsuk-table__caption nhsuk-u-visually-hidden">Frameworks you are working on</caption>
+        <thead role="rowgroup" class="nhsuk-table__head">
+          <tr role="row">
+            <th role="columnheader" class="" scope="col">
+              Framework
+            </th>
+            <th role="columnheader" class="" scope="col">
+              Created
+            </th>
+            <th role="columnheader" class="" scope="col">
+              Status
+            </th>
+            <th role="columnheader" class="" scope="col">
+              Owner
+            </th>
+            <th role="columnheader" class="" scope="col">
+              Actions
+            </th>
+          </tr>
+        </thead>
+        <tbody class="nhsuk-table__body">
+          @foreach (var framework in Model.BrandedFrameworks)
+          {
+            <tr role="row" class="nhsuk-table__row framework-row">
+              <td role="cell" class="nhsuk-table__cell">
+                <span class="nhsuk-table-responsive__heading">Framework </span>
+                <span class="framework-name">
+                  @framework.FrameworkName
+                </span>
+              </td>
+              <td role="cell" class="nhsuk-table__cell">
+                <span class="nhsuk-table-responsive__heading">Created </span>
+                <span class="framework-created-date">
+                  @framework.CreatedDate.ToShortDateString()
+                </span>
+              </td>
+              <td role="cell" class="nhsuk-table__cell">
+                <span class="nhsuk-table-responsive__heading">Status </span>
+                <span class="framework-publish-status">
+                  <partial name="Shared/_StatusTag" model="framework.PublishStatusID" />
+                </span>
+              </td>
+              <td role="cell" class="nhsuk-table__cell">
+                <span class="nhsuk-table-responsive__heading">Owner </span>
+                <span class="framework-owner">
+                  @framework.Owner
+                </span>
+              </td>
+              <td role="cell" class="nhsuk-table__cell">
+                <span class="nhsuk-table-responsive__heading">Actions </span>
+                @if (framework.UserRole > 1)
+                {
+                  <a asp-action="ViewFramework" asp-route-frameworkId="@framework.ID" asp-route-tabname="Structure">
+                    View/Edit
+                  </a>
+                }
+                else if (framework.UserRole == 1)
+                {
+                  <a asp-action="ViewFramework" asp-route-frameworkId="@framework.ID" asp-route-tabname="Structure">
+                    Review
+                  </a>
+                }
+              </td>
+            </tr>
+          }
+        </tbody>
+      </table>
+    }
     <partial name="SearchablePage/_BottomPagination" model="Model" />
 
   </form>
diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Shared/_BrandedFrameworkTable.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Shared/_BrandedFrameworkTable.cshtml
index fa84e2a2ea..0903ff9fd1 100644
--- a/DigitalLearningSolutions.Web/Views/Frameworks/Shared/_BrandedFrameworkTable.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Frameworks/Shared/_BrandedFrameworkTable.cshtml
@@ -1,78 +1,80 @@
 @using DigitalLearningSolutions.Data.Models.Frameworks
 @model IEnumerable<BrandedFramework>
-<table role="table" class="nhsuk-table-responsive">
+@if (Model != null && Model.Count() > 0)
+{
+  <table role="table" class="nhsuk-table-responsive">
     <caption class="nhsuk-table__caption nhsuk-u-visually-hidden">
       Frameworks
     </caption>
-  <thead role="rowgroup" class="nhsuk-table__head">
-    <tr role="row">
-      <th role="columnheader" class="" scope="col">
-        Framework
-      </th>
-      <th role="columnheader" class="" scope="col">
-        Created
-      </th>
-      <th role="columnheader" class="" scope="col">
-        Status
-      </th>
-      <th role="columnheader" class="" scope="col">
-        Owner
-      </th>
-      <th role="columnheader" class="" scope="col">
-        Actions
-      </th>
-    </tr>
-  </thead>
-  <tbody class="nhsuk-table__body">
-    @foreach (var framework in Model)
-    {
-      <tr role="row" class="nhsuk-table__row framework-row">
-        <td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
-          <span class="nhsuk-table-responsive__heading">Framework </span>
-          <span class="framework-brand">
-            @framework.Brand
-          </span>
-          @if (framework.Category != null)
-          {<span>/</span><span class="framework-category"> @framework.Category </span>}<span>/</span>
-          <span class="framework-name nhsuk-u-font-weight-bold">
-            @framework.FrameworkName
-          </span>
-        </td>
-        <td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
-          <span class="nhsuk-table-responsive__heading">Created </span>
-          <span class="framework-created-date">
-            @framework.CreatedDate.ToShortDateString()
-          </span>
-        </td>
-        <td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
-          <span class="nhsuk-table-responsive__heading">Status </span>
-          <span class="framework-publish-status">
-            <partial name="Shared/_StatusTag" model="framework.PublishStatusID" />
-          </span>
-        </td>
-        <td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
-          <span class="nhsuk-table-responsive__heading">Owner </span>
-          <span class="framework-owner">
-            @framework.Owner
-          </span>
-        </td>
-        <td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
-          <span class="nhsuk-table-responsive__heading">Actions </span>
-          @if (framework.UserRole > 1)
-          {
-            <a asp-action="ViewFramework" asp-route-frameworkId="@framework.ID" asp-route-tabname="Structure">
-              View/Edit
-            </a>
-          }
-          else
-          {
-            <a asp-action="ViewFramework" asp-route-frameworkId="@framework.ID" asp-route-tabname="Structure">
-              View
-            </a>
-          }
-        </td>
+    <thead role="rowgroup" class="nhsuk-table__head">
+      <tr role="row">
+        <th role="columnheader" class="" scope="col">
+          Framework
+        </th>
+        <th role="columnheader" class="" scope="col">
+          Created
+        </th>
+        <th role="columnheader" class="" scope="col">
+          Status
+        </th>
+        <th role="columnheader" class="" scope="col">
+          Owner
+        </th>
+        <th role="columnheader" class="" scope="col">
+          Actions
+        </th>
       </tr>
-    }
-  </tbody>
-</table>
-
+    </thead>
+    <tbody class="nhsuk-table__body">
+      @foreach (var framework in Model)
+      {
+        <tr role="row" class="nhsuk-table__row framework-row">
+          <td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
+            <span class="nhsuk-table-responsive__heading">Framework </span>
+            <span class="framework-brand">
+              @framework.Brand
+            </span>
+            @if (framework.Category != null)
+            {<span>/</span><span class="framework-category"> @framework.Category </span>}<span>/</span>
+            <span class="framework-name nhsuk-u-font-weight-bold">
+              @framework.FrameworkName
+            </span>
+          </td>
+          <td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
+            <span class="nhsuk-table-responsive__heading">Created </span>
+            <span class="framework-created-date">
+              @framework.CreatedDate.ToShortDateString()
+            </span>
+          </td>
+          <td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
+            <span class="nhsuk-table-responsive__heading">Status </span>
+            <span class="framework-publish-status">
+              <partial name="Shared/_StatusTag" model="framework.PublishStatusID" />
+            </span>
+          </td>
+          <td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
+            <span class="nhsuk-table-responsive__heading">Owner </span>
+            <span class="framework-owner">
+              @framework.Owner
+            </span>
+          </td>
+          <td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
+            <span class="nhsuk-table-responsive__heading">Actions </span>
+            @if (framework.UserRole > 1)
+            {
+              <a asp-action="ViewFramework" asp-route-frameworkId="@framework.ID" asp-route-tabname="Structure">
+                View/Edit
+              </a>
+            }
+            else
+            {
+              <a asp-action="ViewFramework" asp-route-frameworkId="@framework.ID" asp-route-tabname="Structure">
+                View
+              </a>
+            }
+          </td>
+        </tr>
+      }
+    </tbody>
+  </table>
+}