diff --git a/src/app/components/building-passport/Toolbar.tsx b/src/app/components/building-passport/Toolbar.tsx
index 8f57d216..58866edf 100644
--- a/src/app/components/building-passport/Toolbar.tsx
+++ b/src/app/components/building-passport/Toolbar.tsx
@@ -39,6 +39,16 @@ export function Toolbar({ propertyId, portfolioId }: ToolbarProps) {
     </NavigationMenuLink>
   );
 
+  const energyAssessmentsReportButton = (
+    <NavigationMenuLink
+      className={navigationMenuTriggerStyle() + " ml-3 mr-2"}
+      href={`/portfolio/${portfolioId}/building-passport/${propertyId}/energy-assessment`}
+    >
+      <NewspaperIcon className="h-4 w-4 mr-2" />
+      Energy Assessment
+    </NavigationMenuLink>
+  );
+
   const solarAnalysisButton = (
     <NavigationMenuLink
       className={navigationMenuTriggerStyle() + " ml-3 mr-2"}
@@ -73,13 +83,7 @@ export function Toolbar({ propertyId, portfolioId }: ToolbarProps) {
         {preAssessmentReportButton}
         {solarAnalysisButton}
         {recommendationsButton}
-        {/* <NavigationMenuLink
-          className={navigationMenuTriggerStyle() + " ml-3 mr-2"}
-          href={`/portfolio/${portfolioId}/building-passport/${propertyId}/plan-optimiser`}
-        >
-          <LightBulbIcon className="h-4 w-4 mr-2" />
-          Plan optimiser
-        </NavigationMenuLink> */}
+        {energyAssessmentsReportButton}
         <NavigationMenuItem
           className={navigationMenuTriggerStyle() + " ml-3 mr-2"}
           onClick={handleClickSettings}
diff --git a/src/app/portfolio/[slug]/building-passport/[propertyId]/energy-assessment/page.tsx b/src/app/portfolio/[slug]/building-passport/[propertyId]/energy-assessment/page.tsx
new file mode 100644
index 00000000..925a9e2f
--- /dev/null
+++ b/src/app/portfolio/[slug]/building-passport/[propertyId]/energy-assessment/page.tsx
@@ -0,0 +1,18 @@
+export default async function EnergyAssessmentsPage({
+  params,
+}: {
+  params: { slug: string; propertyId: string };
+}) {
+  // If there's no solar data, we cannot display the page
+
+  return (
+    <div className="flex items-center justify-center min-h-screen">
+      <div className="text-center text-gray-500">
+        <div className="text-2xl font-semibold mb-4">
+          This property does not have a Domna energy assessement
+        </div>
+        <p className="text-lg">Please check back later for updates.</p>
+      </div>
+    </div>
+  );
+}