diff --git a/internal/server/portforward.go b/internal/server/portforward.go
index d2f7b392..44693818 100644
--- a/internal/server/portforward.go
+++ b/internal/server/portforward.go
@@ -37,14 +37,9 @@ func (h *portForwardHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 func (h *portForwardHandler) getPortForwarded(w http.ResponseWriter) {
 	ports := h.portForward.GetPortsForwarded()
 	encoder := json.NewEncoder(w)
-	var data any
-	switch len(ports) {
-	case 0:
-		data = portWrapper{Port: 0} // TODO v4 change to portsWrapper
-	case 1:
-		data = portWrapper{Port: ports[0]} // TODO v4 change to portsWrapper
-	default:
-		data = portsWrapper{Ports: ports}
+	data := portsWrapper{Ports: ports}
+	if len(ports) > 0 {
+		data.Port = ports[0] // TODO v4 remove
 	}
 
 	err := encoder.Encode(data)
diff --git a/internal/server/wrappers.go b/internal/server/wrappers.go
index c35f1c6a..5bc5e049 100644
--- a/internal/server/wrappers.go
+++ b/internal/server/wrappers.go
@@ -25,11 +25,8 @@ func (sw *statusWrapper) getStatus() (status models.LoopStatus, err error) {
 	}
 }
 
-type portWrapper struct { // TODO v4 remove
-	Port uint16 `json:"port"`
-}
-
 type portsWrapper struct {
+	Port  uint16   `json:"port"` // TODO v4 remove
 	Ports []uint16 `json:"ports"`
 }