diff --git a/__mocks__/data/eservice.mocks.ts b/__mocks__/data/eservice.mocks.ts
index e06b6761d..df8e1cc16 100644
--- a/__mocks__/data/eservice.mocks.ts
+++ b/__mocks__/data/eservice.mocks.ts
@@ -110,6 +110,10 @@ const createMockEServiceDescriptorProvider = createMockFactory<ProducerEServiceD
         audience: [],
       },
     ],
+    producer: {
+      id: '4edda5fd-2fed-485c-9ab4-bc7d78a67624',
+      tenantKind: 'PA',
+    },
     id: '4edda5fd-2fed-485c-9ab4-bc7d78a67624',
     name: '-- LUMACA -- test 20/10 [4]\t',
     technology: 'REST',
diff --git a/src/api/api.generatedTypes.ts b/src/api/api.generatedTypes.ts
index 10d980b6c..afa77ba56 100644
--- a/src/api/api.generatedTypes.ts
+++ b/src/api/api.generatedTypes.ts
@@ -343,6 +343,7 @@ export interface ProducerDescriptorEService {
   id: string
   name: string
   description: string
+  producer: ProducerDescriptorEServiceProducer
   /** EService Descriptor State */
   technology: EServiceTechnology
   /** Risk Analysis Mode */
@@ -354,6 +355,12 @@ export interface ProducerDescriptorEService {
   isSignalHubEnabled?: boolean
 }
 
+export interface ProducerDescriptorEServiceProducer {
+  /** @format uuid */
+  id: string
+  tenantKind?: TenantKind
+}
+
 export interface EServiceDoc {
   /** @format uuid */
   id: string
@@ -1832,6 +1839,10 @@ export interface GetClientKeysParams {
   clientId: string
 }
 
+export interface RetrieveLatestRiskAnalysisConfigurationParams {
+  tenantKind?: TenantKind
+}
+
 export interface RetrieveRiskAnalysisConfigurationByVersionParams {
   /** @format uuid */
   eserviceId: string
@@ -4190,7 +4201,9 @@ export namespace Purposes {
    */
   export namespace RetrieveLatestRiskAnalysisConfiguration {
     export type RequestParams = {}
-    export type RequestQuery = {}
+    export type RequestQuery = {
+      tenantKind?: TenantKind
+    }
     export type RequestBody = never
     export type RequestHeaders = {
       'X-Correlation-Id': string
diff --git a/src/api/purpose/purpose.queries.ts b/src/api/purpose/purpose.queries.ts
index 018aa37a6..ee2c9cd72 100644
--- a/src/api/purpose/purpose.queries.ts
+++ b/src/api/purpose/purpose.queries.ts
@@ -3,6 +3,7 @@ import { PurposeServices } from './purpose.services'
 import type {
   GetConsumerPurposesParams,
   GetProducerPurposesParams,
+  RetrieveLatestRiskAnalysisConfigurationParams,
   RetrieveRiskAnalysisConfigurationByVersionParams,
 } from '../api.generatedTypes'
 
@@ -27,10 +28,10 @@ function getSingle(purposeId: string) {
   })
 }
 
-function getRiskAnalysisLatest() {
+function getRiskAnalysisLatest(params?: RetrieveLatestRiskAnalysisConfigurationParams) {
   return queryOptions({
     queryKey: ['GetRiskAnalysisLatest'],
-    queryFn: () => PurposeServices.getRiskAnalysisLatest(),
+    queryFn: () => PurposeServices.getRiskAnalysisLatest(params),
   })
 }
 
diff --git a/src/api/purpose/purpose.services.ts b/src/api/purpose/purpose.services.ts
index c286fede3..8f4523d03 100644
--- a/src/api/purpose/purpose.services.ts
+++ b/src/api/purpose/purpose.services.ts
@@ -14,6 +14,7 @@ import type {
   PurposeVersionResource,
   PurposeVersionSeed,
   RejectPurposeVersionPayload,
+  RetrieveLatestRiskAnalysisConfigurationParams,
   RetrieveRiskAnalysisConfigurationByVersionParams,
   ReversePurposeUpdateContent,
   RiskAnalysisFormConfig,
@@ -68,9 +69,10 @@ async function getSingle(purposeId: string) {
   return REMOVE_ME_remapPurpose(response.data)
 }
 
-async function getRiskAnalysisLatest() {
+async function getRiskAnalysisLatest(params?: RetrieveLatestRiskAnalysisConfigurationParams) {
   const response = await axiosInstance.get<RiskAnalysisFormConfig>(
-    `${BACKEND_FOR_FRONTEND_URL}/purposes/riskAnalysis/latest`
+    `${BACKEND_FOR_FRONTEND_URL}/purposes/riskAnalysis/latest`,
+    { params }
   )
   return response.data
 }
diff --git a/src/pages/ProviderEServiceCreatePage/components/EServiceCreateStepPurpose/EServiceCreateStepPurposeRiskAnalysis/EServiceCreateStepPurposeRiskAnalysis.tsx b/src/pages/ProviderEServiceCreatePage/components/EServiceCreateStepPurpose/EServiceCreateStepPurposeRiskAnalysis/EServiceCreateStepPurposeRiskAnalysis.tsx
index b2f2e52e1..7f7692711 100644
--- a/src/pages/ProviderEServiceCreatePage/components/EServiceCreateStepPurpose/EServiceCreateStepPurposeRiskAnalysis/EServiceCreateStepPurposeRiskAnalysis.tsx
+++ b/src/pages/ProviderEServiceCreatePage/components/EServiceCreateStepPurpose/EServiceCreateStepPurposeRiskAnalysis/EServiceCreateStepPurposeRiskAnalysis.tsx
@@ -14,7 +14,15 @@ export const EServiceCreateStepPurposeRiskAnalysis: React.FC = () => {
   const { mutate: addEServiceRiskAnalysis } = EServiceMutations.useAddEServiceRiskAnalysis()
   const { mutate: updateEServiceRiskAnalysis } = EServiceMutations.useUpdateEServiceRiskAnalysis()
 
-  const { data: riskAnalysisLatest } = useQuery(PurposeQueries.getRiskAnalysisLatest())
+  const { data: riskAnalysisLatest } = useQuery(
+    PurposeQueries.getRiskAnalysisLatest({
+      /**
+       * We need to retrieve the risk analysis configuration for the tenant kind of the producer
+       * because the actual user might be a producer delegate with a different tenant kind.
+       */
+      tenantKind: descriptor?.eservice.producer.tenantKind,
+    })
+  )
 
   if (!riskAnalysisLatest || !descriptor) return <RiskAnalysisFormSkeleton />