diff --git a/apps/datahub/src/app/organization/organization-details/organization-details.component.html b/apps/datahub/src/app/organization/organization-details/organization-details.component.html
index bfba23a856..c61ae4f000 100644
--- a/apps/datahub/src/app/organization/organization-details/organization-details.component.html
+++ b/apps/datahub/src/app/organization/organization-details/organization-details.component.html
@@ -96,12 +96,7 @@
             </div>
 
             <div id="lastPublishedDatasets" data-test="lastPubliDatasets">
-              <ng-container
-                *ngIf="
-                  !isSearchFacadeLoading && lastPublishedDatasets.length > 0;
-                  else orgHasNoDataset
-                "
-              >
+              <ng-container *ngIf="!isSearchFacadeLoading">
                 <div
                   class="mb-4 flex flex-wrap gap-9 justify-center sm:justify-start px-[25px]"
                   data-test="orgPageLasPubDat"
@@ -136,16 +131,6 @@
                   <gn-ui-spinning-loader></gn-ui-spinning-loader>
                 </div>
               </ng-container>
-
-              <ng-template
-                #orgHasNoDataset
-                *ngIf="!isSearchFacadeLoading"
-                data-test="orgHasNoDataset"
-              >
-                <gn-ui-error
-                  [type]="ErrorType.ORGANIZATION_HAS_NO_DATASET"
-                ></gn-ui-error>
-              </ng-template>
             </div>
           </div>
         </div>
diff --git a/apps/datahub/src/app/organization/organization-details/organization-details.component.spec.ts b/apps/datahub/src/app/organization/organization-details/organization-details.component.spec.ts
index 0e012675da..0df6026e40 100644
--- a/apps/datahub/src/app/organization/organization-details/organization-details.component.spec.ts
+++ b/apps/datahub/src/app/organization/organization-details/organization-details.component.spec.ts
@@ -280,15 +280,6 @@ describe('OrganizationDetailsComponent', () => {
 
         expect(orgPageLasPubDat?.children.length).toEqual(1)
       })
-
-      it('should display the orgHasNodataset error component if the org has no dataset', () => {
-        results.next([])
-        fixture.detectChanges()
-
-        const orgHasNoDataset = getHTMLElement('lastPubliDatasets')
-
-        expect(orgHasNoDataset).toBeTruthy()
-      })
     })
   })
 
diff --git a/libs/ui/elements/src/lib/error/error.component.stories.ts b/libs/ui/elements/src/lib/error/error.component.stories.ts
index 0e53bc15c5..3d9e0aa12e 100644
--- a/libs/ui/elements/src/lib/error/error.component.stories.ts
+++ b/libs/ui/elements/src/lib/error/error.component.stories.ts
@@ -49,6 +49,8 @@ export const Primary: StoryObj<ErrorComponent> = {
         ErrorType.COULD_NOT_REACH_API,
         ErrorType.RECORD_NOT_FOUND,
         ErrorType.DATASET_HAS_NO_LINK,
+        ErrorType.ORGANIZATION_HAS_NO_DATASET,
+        ErrorType.ORGANIZATION_NOT_FOUND,
       ],
     },
   },