diff --git a/ui/src/app/pages/server-routes/server-show/server-show.page.html b/ui/src/app/pages/server-routes/server-show/server-show.page.html
index 7a93cb72c..2061818c3 100644
--- a/ui/src/app/pages/server-routes/server-show/server-show.page.html
+++ b/ui/src/app/pages/server-routes/server-show/server-show.page.html
@@ -30,6 +30,13 @@
     <ion-item-group>
       <ion-item-divider></ion-item-divider>
 
+      <ion-item lines="none"  button (click)="checkForUpdates()">
+        <ion-icon slot="start" name="refresh-outline" color="primary"></ion-icon>
+        <ion-label><ion-text style="font-weight: bold;" color="primary">Check for Updates</ion-text></ion-label>
+      </ion-item>
+
+      <ion-item-divider></ion-item-divider>
+
       <ion-item [routerLink]="['specs']">
         <ion-icon slot="start" name="information-circle-outline" color="primary"></ion-icon>
         <ion-label><ion-text color="primary">About</ion-text></ion-label>
@@ -45,21 +52,12 @@
         <ion-label><ion-text color="primary">Config</ion-text></ion-label>
       </ion-item>
 
-      <ion-item-divider></ion-item-divider>
-
-      <ion-item lines="none"  button (click)="checkForUpdates()">
-        <ion-icon slot="start" name="refresh-outline" color="primary"></ion-icon>
-        <ion-label><ion-text style="font-weight: bold;" color="primary">Check for Updates</ion-text></ion-label>
-      </ion-item>
-
-      <ion-item-divider></ion-item-divider>
-
       <ion-item [routerLink]="['lan']">
         <ion-icon slot="start" name="home-outline" color="primary"></ion-icon>
         <ion-label><ion-text color="primary">Secure LAN Setup</ion-text></ion-label>
       </ion-item>
 
-      <ion-item [routerLink]="['wifi']">
+      <ion-item *ngIf="(server.wifi | async)?.ssids.length" [routerLink]="['wifi']">
         <ion-icon slot="start" name="wifi" color="primary"></ion-icon>
         <ion-label><ion-text color="primary">WiFi</ion-text></ion-label>
       </ion-item>
diff --git a/ui/src/app/pages/server-routes/wifi/wifi.page.html b/ui/src/app/pages/server-routes/wifi/wifi.page.html
index 283ea0889..8bc89f6f1 100644
--- a/ui/src/app/pages/server-routes/wifi/wifi.page.html
+++ b/ui/src/app/pages/server-routes/wifi/wifi.page.html
@@ -23,14 +23,16 @@
   <ion-item-group>
     <ion-item>
       <ion-label class="ion-text-wrap">
+        <ion-text color="warning">Warning!</ion-text>
+        <br />
+        <br />
         <p>
-          Add WiFi credentials to your Embassy so it can connect to the Internet without an ethernet cable.
+          <ion-text color="dark">This feature has been temporarily deprecated. If you make changes to WiFi, your Embassy may need to be restarted, and it may become unreachable over Tor for hours. This is an issue with the Tor daemon adjusting to network changes and is on the docket to be fixed.</ion-text>
         </p>
+        <!-- <p>Add WiFi credentials to your Embassy so it can connect to the Internet without an ethernet cable.</p> -->
       </ion-label>
     </ion-item>
 
-    <ion-item-divider class="borderless"></ion-item-divider>
-
     <ion-item-divider>Saved Networks</ion-item-divider>
     <ion-item button detail="false" *ngFor="let ssid of (server.wifi | async)?.ssids" (click)="presentAction(ssid)">
       <ion-label>{{ ssid }}</ion-label>