diff --git a/src/app/community/community.component.html b/src/app/community/community.component.html
index 4af70052ae..8827a54ca8 100644
--- a/src/app/community/community.component.html
+++ b/src/app/community/community.component.html
@@ -24,17 +24,21 @@ <h3 style="text-align: right; margin-right: 0.5rem;">
         </mat-tab>
         <mat-tab i18n-label label="Services">
           <planet-markdown *ngIf="team.description" [content]="team.description || ''"></planet-markdown>
+          <p *ngIf="!team.description" i18n>No description available.</p>
           <ng-container *ngIf="!planetCode">
             <button *planetAuthorizedRoles="''" (click)="openDescriptionDialog()" mat-stroked-button i18n>
               { servicesDescriptionLabel, select, Edit {Edit} Add {Add}} { configuration.planetType, select, community {Community} nation {Nation} center {Earth}} Description
             </button>
           </ng-container>
-          <mat-nav-list>
-            <mat-list-item *ngFor="let link of links" [routerLink]="(link.teamType === 'sync' || !planetCode) ? link.route : []" i18n-matTooltip [matTooltip]="(link.teamType === 'sync' || !planetCode) ? '' : link.title + ' is only available on ' + configuration.name" [disableRipple]="link.teamType === 'local' && planetCode">
-              <span matLine>{{link.title}}</span>
-              <button *ngIf="deleteMode" mat-icon-button color="warn" (click)="openDeleteLinkDialog(link); $event.stopPropagation()"><mat-icon>delete</mat-icon></button>
-            </mat-list-item>
-          </mat-nav-list>
+          <ng-container *ngIf="links.length > 0">
+            <mat-nav-list>
+              <mat-list-item *ngFor="let link of links" [routerLink]="(link.teamType === 'sync' || !planetCode) ? link.route : []" i18n-matTooltip [matTooltip]="(link.teamType === 'sync' || !planetCode) ? '' : link.title + ' is only available on ' + configuration.name" [disableRipple]="link.teamType === 'local' && planetCode">
+                <span matLine>{{link.title}}</span>
+                <button *ngIf="deleteMode" mat-icon-button color="warn" (click)="openDeleteLinkDialog(link); $event.stopPropagation()"><mat-icon>delete</mat-icon></button>
+              </mat-list-item>
+            </mat-nav-list>
+          </ng-container>
+          <p *ngIf="links.length === 0" i18n>No links available.</p>
           <ng-container *ngIf="!planetCode">
             <div *planetAuthorizedRoles="''" class="action-buttons">
               <button (click)="openAddLinkDialog()" mat-stroked-button i18n>Add Link</button>