diff --git a/CHANGELOG.md b/CHANGELOG.md
index e2048d1575..9f04a76124 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -48,6 +48,10 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * (evm) [tharsis#650](https://github.com/tharsis/ethermint/pull/650) Fix panic when flattening the cache context in case transaction is reverted.
 * (rpc, test) [tharsis#608](https://github.com/tharsis/ethermint/pull/608) Fix rpc test.
 
+### Improvements
+
+(rpc) [tharsis#679](https://github.com/tharsis/ethermint/pull/679) Fix file close handle.
+
 ## [v0.7.0] - 2021-10-07
 
 ### API Breaking
diff --git a/rpc/ethereum/namespaces/debug/utils.go b/rpc/ethereum/namespaces/debug/utils.go
index 0910040a87..b8a2a40f7e 100644
--- a/rpc/ethereum/namespaces/debug/utils.go
+++ b/rpc/ethereum/namespaces/debug/utils.go
@@ -48,7 +48,11 @@ func writeProfile(name, file string, log log.Logger) error {
 	if err != nil {
 		return err
 	}
-	defer f.Close()
 
-	return p.WriteTo(f, 0)
+	if err := p.WriteTo(f, 0); err != nil {
+		f.Close()
+		return err
+	}
+
+	return f.Close()
 }