diff --git a/Modules/CIPPCore/Public/Entrypoints/Timer Functions/Start-DurableCleanup.ps1 b/Modules/CIPPCore/Public/Entrypoints/Timer Functions/Start-DurableCleanup.ps1
index af01cdd07100..e0a17d97311b 100644
--- a/Modules/CIPPCore/Public/Entrypoints/Timer Functions/Start-DurableCleanup.ps1	
+++ b/Modules/CIPPCore/Public/Entrypoints/Timer Functions/Start-DurableCleanup.ps1	
@@ -39,6 +39,7 @@ function Start-DurableCleanup {
             Write-Information "Orchestrator: $($Orchestrator.PartitionKey), created: $CreatedTime, running for: $RunningDuration minutes"
             $ClearQueues = $true
             if ($PSCmdlet.ShouldProcess($_.PartitionKey, 'Terminate Orchestrator')) {
+                $Orchestrator = Get-CIPPAzDataTableEntity @Table -Filter "PartitionKey eq '$($Orchestrator.PartitionKey)'"
                 $Orchestrator.RuntimeStatus = 'Failed'
                 Update-AzDataTableEntity @Table -Entity $Orchestrator
                 $CleanupCount++
diff --git a/Modules/CIPPCore/Public/Set-CIPPGDAPInviteGroups.ps1 b/Modules/CIPPCore/Public/Set-CIPPGDAPInviteGroups.ps1
index 412741e5dda1..fe0f4465f179 100644
--- a/Modules/CIPPCore/Public/Set-CIPPGDAPInviteGroups.ps1
+++ b/Modules/CIPPCore/Public/Set-CIPPGDAPInviteGroups.ps1
@@ -60,6 +60,7 @@ function Set-CIPPGDAPInviteGroups {
                 #Write-Information ($InputObject | ConvertTo-Json)
                 $InstanceId = Start-NewOrchestration -FunctionName 'CIPPOrchestrator' -InputObject (ConvertTo-Json -InputObject $InputObject -Depth 5 -Compress)
                 Write-Information "Started GDAP Invite orchestration with ID = '$InstanceId'"
+                return $InstanceId
             }
         }
     }