diff --git a/bpdm-gate-api/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/api/exception/GateErrorCodes.kt b/bpdm-gate-api/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/api/exception/GateErrorCodes.kt
index c38da3d18..8b9fb635c 100644
--- a/bpdm-gate-api/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/api/exception/GateErrorCodes.kt
+++ b/bpdm-gate-api/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/api/exception/GateErrorCodes.kt
@@ -29,6 +29,7 @@ enum class BusinessPartnerSharingError : ErrorCode {
     SharingProcessError,
     SharingTimeout,
     BpnNotInPool,
+    MissingTaskID,
 }
 
 enum class ChangeLogOutputError : ErrorCode {
diff --git a/bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/service/BusinessPartnerService.kt b/bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/service/BusinessPartnerService.kt
index f6cf6cf10..1ab76ae5a 100644
--- a/bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/service/BusinessPartnerService.kt
+++ b/bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/service/BusinessPartnerService.kt
@@ -255,19 +255,29 @@ class BusinessPartnerService(
             .map { Pair(it, sharingStateMap[it.taskId]!!) }
             .groupBy { (task, _) -> task.processingState.resultState }
 
+        val sharingStatesWithoutTasks = sharingStates.filter { it.taskId !in tasks.map { task -> task.taskId } }
+
         val businessPartnersToUpsert = taskStatesByResult[ResultState.Success]?.map { (task, sharingState) ->
             orchestratorMappings.toBusinessPartner(task.businessPartnerResult!!, sharingState.externalId)
         } ?: emptyList()
         upsertBusinessPartnersOutputFromCandidates(businessPartnersToUpsert)
 
-
-        val errorRequests = taskStatesByResult[ResultState.Error]?.map { (task, sharingState) ->
+        val errorRequests = (taskStatesByResult[ResultState.Error]?.map { (task, sharingState) ->
             SharingStateService.ErrorRequest(
                 SharingStateService.SharingStateIdentifierDto(sharingState.externalId, sharingState.businessPartnerType),
                 BusinessPartnerSharingError.SharingProcessError,
                 if (task.processingState.errors.isNotEmpty()) task.processingState.errors.joinToString(" // ") { it.description } else null
             )
-        } ?: emptyList()
+        } ?: emptyList()).toMutableList()
+
+        errorRequests.addAll(sharingStatesWithoutTasks.map { sharingState ->
+            SharingStateService.ErrorRequest(
+                SharingStateService.SharingStateIdentifierDto(sharingState.externalId, sharingState.businessPartnerType),
+                BusinessPartnerSharingError.MissingTaskID,
+                errorMessage = "Missing Task in Orchestrator"
+            )
+        })
+
         sharingStateService.setError(errorRequests)
 
     }
diff --git a/bpdm-gate/src/test/kotlin/org/eclipse/tractusx/bpdm/gate/controller/BusinessPartnerControllerIT.kt b/bpdm-gate/src/test/kotlin/org/eclipse/tractusx/bpdm/gate/controller/BusinessPartnerControllerIT.kt
index 0e2515593..0417956a6 100644
--- a/bpdm-gate/src/test/kotlin/org/eclipse/tractusx/bpdm/gate/controller/BusinessPartnerControllerIT.kt
+++ b/bpdm-gate/src/test/kotlin/org/eclipse/tractusx/bpdm/gate/controller/BusinessPartnerControllerIT.kt
@@ -574,5 +574,61 @@ class BusinessPartnerControllerIT @Autowired constructor(
 
     }
 
+    @Test
+    fun `insert one business partners but task is missing in orchestrator`() {
+
+        val upsertRequests = listOf(
+            BusinessPartnerNonVerboseValues.bpInputRequestCleaned,
+            BusinessPartnerNonVerboseValues.bpInputRequestError,
+            BusinessPartnerNonVerboseValues.bpInputRequestChina,
+        )
+        gateClient.businessParters.upsertBusinessPartnersInput(upsertRequests).body!!
+
+        val externalId3 = BusinessPartnerNonVerboseValues.bpInputRequestChina.externalId
+
+        val createdSharingState = listOf(
+            SharingStateDto(
+                businessPartnerType = BusinessPartnerType.GENERIC,
+                externalId = externalId3,
+                sharingStateType = SharingStateType.Pending,
+                sharingErrorCode = null,
+                sharingErrorMessage = null,
+                bpn = null,
+                sharingProcessStarted = null,
+                taskId = "2"
+            )
+        )
+
+        //Firstly verifies if the Sharing States was created for new Business Partner
+        val externalIds = listOf(externalId3)
+        val upsertSharingStateResponses = readSharingStates(BusinessPartnerType.GENERIC, externalIds)
+        testHelpers
+            .assertRecursively(upsertSharingStateResponses)
+            .ignoringFieldsMatchingRegexes(".*${SharingStateDto::sharingProcessStarted.name}")
+            .isEqualTo(createdSharingState)
+
+        // Call Finish Cleaning Method
+        businessPartnerService.finishCleaningTask()
+
+        val cleanedSharingState = listOf(
+            SharingStateDto(
+                businessPartnerType = BusinessPartnerType.GENERIC,
+                externalId = externalId3,
+                sharingStateType = SharingStateType.Error,
+                sharingErrorCode = BusinessPartnerSharingError.MissingTaskID,
+                sharingErrorMessage = "Missing Task in Orchestrator",
+                bpn = null,
+                sharingProcessStarted = null,
+                taskId = "2"
+            )
+        )
+
+        //Check for Sharing State
+        val readCleanedSharingState = readSharingStates(BusinessPartnerType.GENERIC, externalIds)
+        testHelpers.assertRecursively(readCleanedSharingState)
+            .ignoringFieldsMatchingRegexes(".*${SharingStateDto::sharingProcessStarted.name}")
+            .isEqualTo(cleanedSharingState)
+
+    }
 
 }