diff --git a/.changeset/forty-dogs-sit.md b/.changeset/forty-dogs-sit.md
deleted file mode 100644
index 2bc3268b31..0000000000
--- a/.changeset/forty-dogs-sit.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"hardhat": patch
----
-
-Improve solidity stack traces performance by getting them from the EDR response.
diff --git a/.changeset/sixty-fireants-greet.md b/.changeset/sixty-fireants-greet.md
deleted file mode 100644
index 692ba351df..0000000000
--- a/.changeset/sixty-fireants-greet.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"hardhat": patch
----
-
-Restored the message linking to the 2024 solidity survey
diff --git a/packages/hardhat-core/CHANGELOG.md b/packages/hardhat-core/CHANGELOG.md
index ef48d586bd..c928be934a 100644
--- a/packages/hardhat-core/CHANGELOG.md
+++ b/packages/hardhat-core/CHANGELOG.md
@@ -1,5 +1,12 @@
 # hardhat
 
+## 2.22.18
+
+### Patch Changes
+
+- 25f45b0: Improve solidity stack traces performance by getting them from the EDR response
+- 0e5c8d7: Restored the message linking to the 2024 solidity survey
+
 ## 2.22.17
 
 ### Patch Changes
diff --git a/packages/hardhat-core/package.json b/packages/hardhat-core/package.json
index 896b63f53c..340138a0d3 100644
--- a/packages/hardhat-core/package.json
+++ b/packages/hardhat-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hardhat",
-  "version": "2.22.17",
+  "version": "2.22.18",
   "author": "Nomic Labs LLC",
   "license": "MIT",
   "homepage": "https://hardhat.org",