diff --git a/.changeset/beige-mangos-knock.md b/.changeset/beige-mangos-knock.md
new file mode 100644
index 0000000000..d8723c3f87
--- /dev/null
+++ b/.changeset/beige-mangos-knock.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-github-actions': patch
+---
+
+Show empty state only when workflow API call has completed
diff --git a/docs/features/techdocs/cli.md b/docs/features/techdocs/cli.md
index 5548adf7f0..30cb8314a0 100644
--- a/docs/features/techdocs/cli.md
+++ b/docs/features/techdocs/cli.md
@@ -1,4 +1,9 @@
-# TechDocs CLI
+---
+id: cli
+title: TechDocs CLI
+# prettier-ignore
+description: TechDocs CLI - a utility command line interface for managing TechDocs sites in Backstage.
+---
 
 Utility command line interface for managing TechDocs sites in
 [Backstage](https://github.com/backstage/backstage).
diff --git a/plugins/catalog-react/CHANGELOG.md b/plugins/catalog-react/CHANGELOG.md
index c628735ef1..5ebe626fad 100644
--- a/plugins/catalog-react/CHANGELOG.md
+++ b/plugins/catalog-react/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @backstage/plugin-catalog-react
 
+## 0.6.6
+
+### Patch Changes
+
+- 4c0f0b2003: Removed dependency on `@backstage/core-app-api`.
+
 ## 0.6.5
 
 ### Patch Changes
diff --git a/plugins/catalog-react/package.json b/plugins/catalog-react/package.json
index b5a6884fa5..da8300ae49 100644
--- a/plugins/catalog-react/package.json
+++ b/plugins/catalog-react/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-catalog-react",
   "description": "A frontend library that helps other Backstage plugins interact with the catalog",
-  "version": "0.6.5",
+  "version": "0.6.6",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,7 +31,6 @@
   "dependencies": {
     "@backstage/catalog-client": "^0.5.2",
     "@backstage/catalog-model": "^0.9.7",
-    "@backstage/core-app-api": "^0.2.0",
     "@backstage/core-components": "^0.8.0",
     "@backstage/core-plugin-api": "^0.3.0",
     "@backstage/errors": "^0.1.4",
@@ -54,6 +53,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "^0.10.1",
+    "@backstage/core-app-api": "^0.2.0",
     "@backstage/test-utils": "^0.1.24",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/github-actions/src/components/WorkflowRunsTable/WorkflowRunsTable.tsx b/plugins/github-actions/src/components/WorkflowRunsTable/WorkflowRunsTable.tsx
index 2506613e0c..81fa036221 100644
--- a/plugins/github-actions/src/components/WorkflowRunsTable/WorkflowRunsTable.tsx
+++ b/plugins/github-actions/src/components/WorkflowRunsTable/WorkflowRunsTable.tsx
@@ -172,8 +172,9 @@ export const WorkflowRunsTable = ({
     });
 
   const githubHost = hostname || 'github.com';
+  const hasNoRuns = !loading && !tableProps.loading && !runs;
 
-  return !runs ? (
+  return hasNoRuns ? (
     <EmptyState
       missing="data"
       title="No Workflow Data"