diff --git a/frontend/src/app/components/connection-settings/connection-settings.component.ts b/frontend/src/app/components/connection-settings/connection-settings.component.ts
index 87f6b54e5..0af59ac6f 100644
--- a/frontend/src/app/components/connection-settings/connection-settings.component.ts
+++ b/frontend/src/app/components/connection-settings/connection-settings.component.ts
@@ -180,7 +180,7 @@ export class ConnectionSettingsComponent implements OnInit {
 
     for (const [key, value] of Object.entries(this.connectionSettings)) {
       if (key === 'hidden_tables') {
-        updatedSettings[key] = value.length > 0;
+        updatedSettings[key] = value?.length > 0;
       } else {
         updatedSettings[key] = Boolean(value);
       }
diff --git a/frontend/src/app/components/dashboard/db-table-view/db-table-settings/db-table-settings.component.html b/frontend/src/app/components/dashboard/db-table-view/db-table-settings/db-table-settings.component.html
index d4db6bdd5..5dbc53d66 100644
--- a/frontend/src/app/components/dashboard/db-table-view/db-table-settings/db-table-settings.component.html
+++ b/frontend/src/app/components/dashboard/db-table-view/db-table-settings/db-table-settings.component.html
@@ -163,7 +163,7 @@ <h2 class="mat-heading-2" style="margin-bottom: -4px; margin-top: 12px">"Edit ro
                     [(ngModel)]="tableSettings.autocomplete_columns">
                     <mat-option *ngFor="let field of fields" [value]="field">{{field}}</mat-option>
                 </mat-select>
-                <mat-hint>Choose the columns Rocketadmin scans within a related table when using the foreign keys box.</mat-hint>
+                <mat-hint>Choose the columns Rocketadmin scans within a related table when selecting a foreign key.</mat-hint>
             </mat-form-field>
 
             <mat-form-field appearance="outline">