diff --git a/src/app/system/configurations/global-configurations-tab/global-configurations-tab.component.html b/src/app/system/configurations/global-configurations-tab/global-configurations-tab.component.html
index 4018307aeb..2c5874f45a 100644
--- a/src/app/system/configurations/global-configurations-tab/global-configurations-tab.component.html
+++ b/src/app/system/configurations/global-configurations-tab/global-configurations-tab.component.html
@@ -14,7 +14,7 @@
       <ng-container matColumnDef="name">
         <th mat-header-cell *matHeaderCellDef mat-sort-header> {{'labels.inputs.name' | translate}} </th>
         <td mat-cell *matCellDef="let configuration"> {{ configuration.name }}&nbsp;&nbsp;
-        <fa-icon icon="question-circle" matTooltip="{{ getTooltip(configuration.description) | translate }}" matTooltipPosition="right"></fa-icon>
+        <fa-icon *ngIf="configuration.description" icon="question-circle" matTooltip="{{ configuration.description | translate }}" matTooltipPosition="right"></fa-icon>
         </td>
       </ng-container>
 
diff --git a/src/app/system/configurations/global-configurations-tab/global-configurations-tab.component.ts b/src/app/system/configurations/global-configurations-tab/global-configurations-tab.component.ts
index 4c5165b91a..8efb20d058 100644
--- a/src/app/system/configurations/global-configurations-tab/global-configurations-tab.component.ts
+++ b/src/app/system/configurations/global-configurations-tab/global-configurations-tab.component.ts
@@ -149,11 +149,4 @@ export class GlobalConfigurationsTabComponent implements OnInit, AfterViewInit {
     this.router.navigate(['/system']);
   }
 
-  getTooltip(description: string): string {
-    if (description === undefined) {
-      return description;
-    }
-    return 'labels.text.No Description';
-  }
-
 }