diff --git a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/tables/dd-table/dd-table.component.ts b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/tables/dd-table/dd-table.component.ts
index 9f369dc3..4493ff6c 100644
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/tables/dd-table/dd-table.component.ts
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/tables/dd-table/dd-table.component.ts
@@ -58,7 +58,7 @@ export class DDTable implements AfterViewInit {
 
   @Input() isSortable: boolean = false;
 
-  @Input() onToggleExpandedRow: (element: any, event: Event) => void = (element: any, event: Event) => { }
+  @Input() onToggleExpandedRow: (element: any, event: Event) => Promise<void> = async (element: any, event: Event) => { }
 
   public get data(): any[] {
     return this.dataSource.data;
@@ -89,12 +89,12 @@ export class DDTable implements AfterViewInit {
     this.table.renderRows();
   }
 
-  toggleExpandedRow(element: any, event: Event): void {
+  async toggleExpandedRow(element: any, event: Event): Promise<void> {
     // first determine the new expanded element, thus it would be possible to use up-to-date 
     const newExpandedElement = this.__expandedElement === element ? null : element;
 
     // before update the expanded element call the call-back method to show up-to-date component
-    this.onToggleExpandedRow(newExpandedElement, event);
+    await this.onToggleExpandedRow(newExpandedElement, event);
 
     // assign expanded element
     this.__expandedElement = newExpandedElement;
diff --git a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/tables/envelope-table/envelope-table.component.ts b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/tables/envelope-table/envelope-table.component.ts
index f3a6bf81..5d7267b4 100644
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/tables/envelope-table/envelope-table.component.ts
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/tables/envelope-table/envelope-table.component.ts
@@ -51,16 +51,12 @@ export class EnvelopeTableComponent implements AfterViewInit {
 
   @ViewChild(ReceiverStatusTableComponent) rsTable!: ReceiverStatusTableComponent
 
-  onToggleExpandedRow: (envelope: any, event: Event) => void = (envelope, event) => {
+  onToggleExpandedRow: (envelope: any, event: Event) => Promise<void> = async (envelope, event) => {
     if (envelope === null || envelope === undefined)
       return;
 
     var uuid: string = envelope.uuid;
-    this.erService.getSecret(uuid).subscribe({
-      next: (er: any[]) => {
-        this.rsTable.data = er;
-      }
-    });
+    this.rsTable.data = await this.erService.getSecretAsync(uuid);
   }
 
   private eService: EnvelopeService = inject(EnvelopeService);