diff --git a/src/frontend/app/features/service-catalog/service-catalog-page/service-catalog-page.component.ts b/src/frontend/app/features/service-catalog/service-catalog-page/service-catalog-page.component.ts
index 2015440447..d2a5d7f0b1 100644
--- a/src/frontend/app/features/service-catalog/service-catalog-page/service-catalog-page.component.ts
+++ b/src/frontend/app/features/service-catalog/service-catalog-page/service-catalog-page.component.ts
@@ -2,13 +2,11 @@ import { Component } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { ListDataSource } from '../../../shared/components/list/data-sources-controllers/list-data-source';
 import {
   CfServicesListConfigService,
 } from '../../../shared/components/list/list-types/cf-services/cf-services-list-config.service';
 import { ListConfig } from '../../../shared/components/list/list.component.types';
 import { CloudFoundryService } from '../../../shared/data-services/cloud-foundry.service';
-import { APIResource } from '../../../store/types/api.types';
 import { getActiveRouteCfOrgSpaceProvider } from '../../cloud-foundry/cf.helpers';
 
 @Component({
@@ -29,7 +27,10 @@ export class ServiceCatalogPageComponent {
 
   constructor(public cloudFoundryService: CloudFoundryService) {
     this.cfIds$ = cloudFoundryService.cFEndpoints$.pipe(
-      map(endpoints => endpoints.map(endpoint => endpoint.guid))
+      map(endpoints => endpoints
+        .filter(endpoint => endpoint.connectionStatus === 'connected')
+        .map(endpoint => endpoint.guid)
+      )
     );
   }
 }
diff --git a/src/frontend/app/features/services/services-wall/services-wall.component.ts b/src/frontend/app/features/services/services-wall/services-wall.component.ts
index d6d1cbcd61..5479cedf57 100644
--- a/src/frontend/app/features/services/services-wall/services-wall.component.ts
+++ b/src/frontend/app/features/services/services-wall/services-wall.component.ts
@@ -12,7 +12,6 @@ import { CfOrgSpaceDataService, initCfOrgSpaceService } from '../../../shared/da
 import { CloudFoundryService } from '../../../shared/data-services/cloud-foundry.service';
 import { AppState } from '../../../store/app-state';
 import { serviceInstancesSchemaKey } from '../../../store/helpers/entity-factory';
-import { endpointsRegisteredCFEntitiesSelector } from '../../../store/selectors/endpoint.selectors';
 
 @Component({
   selector: 'app-services-wall',