diff --git a/lib/data/model/app/menu/server_func.dart b/lib/data/model/app/menu/server_func.dart
index 4ccff487..9c4832cd 100644
--- a/lib/data/model/app/menu/server_func.dart
+++ b/lib/data/model/app/menu/server_func.dart
@@ -49,6 +49,7 @@ enum ServerFuncBtn {
     //pkg,
     snippet,
     systemd,
+    portForward,
   ].map((e) => e.index).toList();
 
   IconData get icon => switch (this) {
diff --git a/lib/data/store/server.dart b/lib/data/store/server.dart
index ab3a0801..9f70e2c8 100644
--- a/lib/data/store/server.dart
+++ b/lib/data/store/server.dart
@@ -175,6 +175,7 @@ class ServerStore extends HiveStore {
     }
 
     for (final spi in ss) {
+      if (get(spi.id) == null) continue;
       if (spi.jumpId != null && idMap.containsKey(spi.jumpId)) {
         final newJumpId = idMap[spi.jumpId]!;
         final newSpi = spi.copyWith(jumpId: newJumpId);