diff --git a/src/app/components/servers/servers.component.html b/src/app/components/servers/servers.component.html
index b1ac30f1..af9774d7 100644
--- a/src/app/components/servers/servers.component.html
+++ b/src/app/components/servers/servers.component.html
@@ -13,8 +13,8 @@
         <ng-container matColumnDef="name">
           <mat-header-cell *matHeaderCellDef> Name </mat-header-cell>
           <mat-cell *matCellDef="let row">
-            <a *ngIf="getServerStatus(row) === 'running'" [routerLink]="['/server', row.id, 'projects']" class="table-link">{{ row.name }}</a>
-            <span *ngIf="getServerStatus(row) != 'running'">{{ row.name }}</span>
+            <a *ngIf="getServerStatus(row) === 'running' || row.location === 'remote'" [routerLink]="['/server', row.id, 'projects']" class="table-link">{{ row.name }}</a>
+            <span *ngIf="getServerStatus(row) != 'running' && row.location !== 'remote'">{{ row.name }}</span>
           </mat-cell>
         </ng-container>
 
diff --git a/src/app/components/servers/servers.component.ts b/src/app/components/servers/servers.component.ts
index 2e8e35ec..e0f6d402 100644
--- a/src/app/components/servers/servers.component.ts
+++ b/src/app/components/servers/servers.component.ts
@@ -103,7 +103,6 @@ export class ServersComponent implements OnInit, OnDestroy {
   }
 
   async stopServer(server: Server) {
-    server.status = "stopped";
     await this.serverManagement.stop(server);
   }
 }