diff --git a/pkg/util/utilfn/utilfn.go b/pkg/util/utilfn/utilfn.go
index ac738c881..914dc4e97 100644
--- a/pkg/util/utilfn/utilfn.go
+++ b/pkg/util/utilfn/utilfn.go
@@ -863,9 +863,9 @@ func AtomicRenameCopy(dstPath string, srcPath string, perms os.FileMode) error {
 	if err != nil {
 		return err
 	}
-	defer dstFd.Close()
 	_, err = io.Copy(dstFd, srcFd)
 	if err != nil {
+		dstFd.Close()
 		return err
 	}
 	err = dstFd.Close()
diff --git a/pkg/wshrpc/wshremote/wshremote.go b/pkg/wshrpc/wshremote/wshremote.go
index 67e3863c8..0cd6b637c 100644
--- a/pkg/wshrpc/wshremote/wshremote.go
+++ b/pkg/wshrpc/wshremote/wshremote.go
@@ -231,10 +231,11 @@ func checkIsReadOnly(path string, fileInfo fs.FileInfo, exists bool) bool {
 			return false
 		}
 		tmpFileName := filepath.Join(dirName, "wsh-tmp-"+randHexStr)
-		_, err = os.Create(tmpFileName)
+		fd, err := os.Create(tmpFileName)
 		if err != nil {
 			return true
 		}
+		fd.Close()
 		os.Remove(tmpFileName)
 		return false
 	}