diff --git a/package.json b/package.json
index f13b71c1f2..d2c578f922 100755
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "planet",
   "license": "AGPL-3.0",
-  "version": "0.16.99",
+  "version": "0.17.0",
   "myplanet": {
     "latest": "v0.22.80",
     "min": "v0.21.80"
diff --git a/src/app/shared/dialogs/dialogs-add-table.component.html b/src/app/shared/dialogs/dialogs-add-table.component.html
index 3d5128a53b..6c3be17345 100644
--- a/src/app/shared/dialogs/dialogs-add-table.component.html
+++ b/src/app/shared/dialogs/dialogs-add-table.component.html
@@ -5,12 +5,12 @@
     <div mat-dialog-title>
       <mat-form-field class="full-width">
         <mat-label i18n>Send to team or enterprise</mat-label>
-        <mat-select [(ngModel)]="selectedLink">
+        <mat-select (selectionChange)="onSelectionChange($event)">
           <mat-option *ngFor="let link of links" [value]="link">{{link.title}}</mat-option>
         </mat-select>
       </mat-form-field>
     </div>
-    <mat-dialog-content *ngIf="selectedLink?.db === 'teams'">
+    <mat-dialog-content *ngIf="selectedLink">
       <planet-teams
         [isDialog]="true"
         [excludeIds]="data.excludeIds"
diff --git a/src/app/shared/dialogs/dialogs-add-table.component.ts b/src/app/shared/dialogs/dialogs-add-table.component.ts
index e2b4c64180..2e95396ca9 100644
--- a/src/app/shared/dialogs/dialogs-add-table.component.ts
+++ b/src/app/shared/dialogs/dialogs-add-table.component.ts
@@ -21,22 +21,19 @@ export class DialogsAddTableComponent implements AfterViewInit {
       this.mode === 'teams' ? this.teamsComponent :
       undefined;
   }
-  selectedLink: { db, title, selector? };
-  links: { db, title, selector? }[] = [
-    { db: 'teams', title: $localize`Teams`, selector: { type: 'team' } },
-    { db: 'teams', title: $localize`Enterprises`, selector: { type: 'enterprise' } }
+  selectedLink: { title, selector? };
+  links: { title, selector? }[] = [
+    { title: $localize`Teams`, selector: { type: 'team' } },
+    { title: $localize`Enterprises`, selector: { type: 'enterprise' } }
   ];
   teamsSelected = [];
 
   constructor(
     public dialogRef: MatDialogRef<DialogsAddTableComponent>,
     @Inject(MAT_DIALOG_DATA) public data: any,
-    private dialogsLoadingService: DialogsLoadingService,
+    private dialogsLoadingService: DialogsLoadingService
   ) {
     this.mode = this.data.mode;
-    if (this.mode === 'teams') {
-      this.selectedLink = this.links[0];
-    }
   }
 
   ngAfterViewInit() {
@@ -72,4 +69,8 @@ export class DialogsAddTableComponent implements AfterViewInit {
     this.okDisabled = this.teamsSelected.length === 0;
   }
 
+  onSelectionChange(selected: any) {
+    this.selectedLink = this.links.find(link => link.selector?.type === selected.value.selector.type);
+  }
+
 }