diff --git a/internal/portforward/service/stop.go b/internal/portforward/service/stop.go
index 208951c3..04eda5f8 100644
--- a/internal/portforward/service/stop.go
+++ b/internal/portforward/service/stop.go
@@ -3,7 +3,6 @@ package service
 import (
 	"context"
 	"fmt"
-	"os"
 	"time"
 )
 
@@ -61,10 +60,10 @@ func (s *Service) cleanup() (err error) {
 	s.ports = nil
 
 	filepath := s.settings.Filepath
-	s.logger.Info("removing port file " + filepath)
-	err = os.Remove(filepath)
+	s.logger.Info("clearing port file " + filepath)
+	err = s.writePortForwardedFile(nil)
 	if err != nil {
-		return fmt.Errorf("removing port file: %w", err)
+		return fmt.Errorf("clearing port file: %w", err)
 	}
 
 	return nil