diff --git a/src/discrete-layer/models/catalogTreeStore.ts b/src/discrete-layer/models/catalogTreeStore.ts
index c3f97e784..8b6f32b3d 100644
--- a/src/discrete-layer/models/catalogTreeStore.ts
+++ b/src/discrete-layer/models/catalogTreeStore.ts
@@ -280,11 +280,12 @@ export const catalogTreeStore = ModelBase.props({
       );
 
       const isUserAdmin = store.userStore.isUserAdmin();
+      const isRecordVectorServed = CONFIG.SERVED_ENTITY_TYPES.includes(RecordType.RECORD_VECTOR);
 
       setCatalogTreeData([
         parentCatalog,
         parentBests,
-        vectorCatalog,
+        ...(isRecordVectorServed ? [vectorCatalog] : []),
         ...(isUserAdmin ? [parentUnpublished] : [])
       ]);
 
diff --git a/src/discrete-layer/views/components/data-fetchers/wfs-features-fetcher.component.tsx b/src/discrete-layer/views/components/data-fetchers/wfs-features-fetcher.component.tsx
index 63b7185de..5cc350250 100644
--- a/src/discrete-layer/views/components/data-fetchers/wfs-features-fetcher.component.tsx
+++ b/src/discrete-layer/views/components/data-fetchers/wfs-features-fetcher.component.tsx
@@ -1,6 +1,8 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 import React, { useEffect } from 'react';
 import { observer } from 'mobx-react';
+import CONFIG from '../../../../common/config';
+import { RecordType } from '../../../models/RecordTypeEnum';
 import { useQuery, useStore } from '../../../models/RootStore';
 
 export interface IFeatureConfig {
@@ -20,6 +22,12 @@ export interface IFeatureConfigs {
 
 export const WfsFeaturesFetcher: React.FC = observer(() => {
   const store = useStore();
+  const isRecordVectorServed = CONFIG.SERVED_ENTITY_TYPES.includes(RecordType.RECORD_VECTOR);
+
+  if (!isRecordVectorServed) {
+    return null;
+  }
+
   const wfsGetFeatureTypesQuery = useQuery((store) => store.queryGetFeatureTypes());
 
   useEffect(() => {