diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98ca302cf..4fe52c8d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,6 +38,7 @@ All notable changes to this project will be documented in this file.
 
 - Fix unfoldable mitigation category when open via the URI fragment.
 - Fix ctrl+click on mitigation does not open new tab.
+- Fix error handling in framework view when no controls are available.
 
 ## [0.3.0] - 2025-04-01
 
diff --git a/apps/console/src/pages/organizations/frameworks/FrameworkView.tsx b/apps/console/src/pages/organizations/frameworks/FrameworkView.tsx
index bb886f886..be792be48 100644
--- a/apps/console/src/pages/organizations/frameworks/FrameworkView.tsx
+++ b/apps/console/src/pages/organizations/frameworks/FrameworkView.tsx
@@ -42,8 +42,12 @@ function FrameworkViewContent({
     queryRef
   );
 
-  if (!data.node.firstControl) {
-    return null;
+  if (!data?.node) {
+    return <div>Framework not found</div>;
+  }
+
+  if (!data.node.firstControl?.edges?.length) {
+    return <div>No controls found for this framework</div>;
   }
 
   return <Control controlKey={data.node.firstControl.edges[0].node} />;