diff --git a/package-lock.json b/package-lock.json
index 78bafa9494..2200305739 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1076,6 +1076,21 @@
         "npm": ">=7.0.0"
       }
     },
+    "node_modules/@libp2p/interface-connection-manager/node_modules/@libp2p/interface-connection": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@libp2p/interface-connection/-/interface-connection-2.1.1.tgz",
+      "integrity": "sha512-gjugaMsZvfo3r4tCc/yPifVQsfLogmEmJtW+eXMNiNDna3ZfmwWD9Z+KyEwuVsXKs0C4GESXei2y4SJSCEfkbA==",
+      "dependencies": {
+        "@libp2p/interface-peer-id": "^1.0.0",
+        "@libp2p/interfaces": "^3.0.0",
+        "@multiformats/multiaddr": "^10.2.0",
+        "it-stream-types": "^1.0.4"
+      },
+      "engines": {
+        "node": ">=16.0.0",
+        "npm": ">=7.0.0"
+      }
+    },
     "node_modules/@libp2p/interface-content-routing": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/@libp2p/interface-content-routing/-/interface-content-routing-1.0.2.tgz",
@@ -9542,6 +9557,18 @@
         "npm": ">=7.0.0"
       }
     },
+    "node_modules/protons-runtime/node_modules/uint8arraylist": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/uint8arraylist/-/uint8arraylist-1.6.0.tgz",
+      "integrity": "sha512-QOh6SQJQj/eEqQ6NJ8SI9LH875uI2ShcOtWE3Yupci0RaHsZm4oP+mUCJzBzKkp+8gCK7M4l+6Ubvlaimt7CSw==",
+      "dependencies": {
+        "uint8arrays": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=16.0.0",
+        "npm": ">=7.0.0"
+      }
+    },
     "node_modules/proxy-from-env": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
@@ -12184,7 +12211,7 @@
       "requires": {
         "@libp2p/components": "^2.0.3",
         "@libp2p/crypto": "^1.0.3",
-        "@libp2p/interface-connection": "3.0.1",
+        "@libp2p/interface-connection": "^3.0.1",
         "@libp2p/interface-keys": "^1.0.3",
         "@libp2p/interface-peer-id": "^1.0.4",
         "@libp2p/interface-pubsub": "^2.0.1",
@@ -12203,7 +12230,7 @@
         "it-pushable": "^3.1.0",
         "multiformats": "^9.6.4",
         "protobufjs": "^6.11.2",
-        "uint8arraylist": "2.3.2",
+        "uint8arraylist": "^2.3.2",
         "uint8arrays": "^3.0.0"
       },
       "dependencies": {
@@ -12235,7 +12262,7 @@
         "it-pipe": "^2.0.3",
         "it-stream-types": "^1.0.4",
         "protons-runtime": "^3.1.0",
-        "uint8arraylist": "2.3.2",
+        "uint8arraylist": "^2.3.2",
         "uint8arrays": "^3.1.0"
       },
       "dependencies": {
@@ -12269,7 +12296,7 @@
           "integrity": "sha512-S1iSPQC0McdHKJRi0XcATBkWgwWPx46UDfrnshYDXBvGHSYqkFtn4MQ8Gatf67w7FzFtHivA+Hb0ZPq56upG8w==",
           "requires": {
             "protobufjs": "^7.0.0",
-            "uint8arraylist": "2.3.2"
+            "uint8arraylist": "^2.3.2"
           }
         }
       }
@@ -12727,7 +12754,7 @@
       "integrity": "sha512-F04yV6ZrMUEaN8YKxUe2UPsLOnDoME4aMxm+i515aYF0fIZ6qAQfCd0PERvtOnygVnIx+3i3gLsejtL5AVPGUA==",
       "requires": {
         "@libp2p/interface-address-manager": "^1.0.1",
-        "@libp2p/interface-connection": "3.0.1",
+        "@libp2p/interface-connection": "^3.0.1",
         "@libp2p/interface-connection-manager": "^1.0.0",
         "@libp2p/interface-content-routing": "^1.0.0",
         "@libp2p/interface-dht": "^1.0.0",
@@ -12774,7 +12801,7 @@
       "resolved": "https://registry.npmjs.org/@libp2p/connection/-/connection-4.0.1.tgz",
       "integrity": "sha512-YT+5cYUsG5H5oaGFJyJSuuKdIdBQ4LQQljNvkuO5REiMvviAiWfiF4CMJIQvDW6m7F+s4qpxDHMYuZPJJw2jzw==",
       "requires": {
-        "@libp2p/interface-connection": "3.0.1",
+        "@libp2p/interface-connection": "^3.0.0",
         "@libp2p/interface-peer-id": "^1.0.2",
         "@libp2p/interfaces": "^3.0.2",
         "@libp2p/logger": "^2.0.0",
@@ -12828,7 +12855,7 @@
           "integrity": "sha512-S1iSPQC0McdHKJRi0XcATBkWgwWPx46UDfrnshYDXBvGHSYqkFtn4MQ8Gatf67w7FzFtHivA+Hb0ZPq56upG8w==",
           "requires": {
             "protobufjs": "^7.0.0",
-            "uint8arraylist": "2.3.2"
+            "uint8arraylist": "^2.3.2"
           }
         }
       }
@@ -12851,7 +12878,7 @@
         "@libp2p/interfaces": "^3.0.0",
         "@multiformats/multiaddr": "^10.2.0",
         "it-stream-types": "^1.0.4",
-        "uint8arraylist": "2.3.2"
+        "uint8arraylist": "^2.1.1"
       }
     },
     "@libp2p/interface-connection-encrypter": {
@@ -12861,7 +12888,7 @@
       "requires": {
         "@libp2p/interface-peer-id": "^1.0.0",
         "it-stream-types": "^1.0.4",
-        "uint8arraylist": "2.3.2"
+        "uint8arraylist": "^2.1.1"
       }
     },
     "@libp2p/interface-connection-manager": {
@@ -12869,9 +12896,22 @@
       "resolved": "https://registry.npmjs.org/@libp2p/interface-connection-manager/-/interface-connection-manager-1.0.2.tgz",
       "integrity": "sha512-92gM7sZhVidD+vsQbc+LbI4MMvxgRjFy9kUrrsOosbtCt0nl68rIeRFKRpfX92/4QY40tL41VXT69ijCUskEwg==",
       "requires": {
-        "@libp2p/interface-connection": "3.0.1",
+        "@libp2p/interface-connection": "^2.0.0",
         "@libp2p/interface-peer-id": "^1.0.0",
         "@libp2p/interfaces": "^3.0.0"
+      },
+      "dependencies": {
+        "@libp2p/interface-connection": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/@libp2p/interface-connection/-/interface-connection-2.1.1.tgz",
+          "integrity": "sha512-gjugaMsZvfo3r4tCc/yPifVQsfLogmEmJtW+eXMNiNDna3ZfmwWD9Z+KyEwuVsXKs0C4GESXei2y4SJSCEfkbA==",
+          "requires": {
+            "@libp2p/interface-peer-id": "^1.0.0",
+            "@libp2p/interfaces": "^3.0.0",
+            "@multiformats/multiaddr": "^10.2.0",
+            "it-stream-types": "^1.0.4"
+          }
+        }
       }
     },
     "@libp2p/interface-content-routing": {
@@ -12964,7 +13004,7 @@
           "integrity": "sha512-eaG4X8VDR8DsZ7fcTTJcKvJF4JdNGPlkKbuGywizLAZXtKd3ZNQKAxc8eYxO/y1aa/ZhLu3QzJdEfcP86pUbBw==",
           "requires": {
             "@libp2p/interface-peer-id": "^1.0.0",
-            "uint8arraylist": "2.3.2"
+            "uint8arraylist": "^2.0.0"
           }
         }
       }
@@ -12974,11 +13014,11 @@
       "resolved": "https://registry.npmjs.org/@libp2p/interface-pubsub/-/interface-pubsub-2.0.1.tgz",
       "integrity": "sha512-j6XSYz5Ir5yJH6KCtYMUGYlbBFfDGx/vPfFe1X3UFIC6qZ9N+IMkde6C5DCQ8calhCyM1pB2K5StAlztsZV2BQ==",
       "requires": {
-        "@libp2p/interface-connection": "3.0.1",
+        "@libp2p/interface-connection": "^3.0.0",
         "@libp2p/interface-peer-id": "^1.0.0",
         "@libp2p/interfaces": "^3.0.0",
         "it-pushable": "^3.0.0",
-        "uint8arraylist": "2.3.2"
+        "uint8arraylist": "^2.0.0"
       },
       "dependencies": {
         "it-pushable": {
@@ -12993,7 +13033,7 @@
       "resolved": "https://registry.npmjs.org/@libp2p/interface-registrar/-/interface-registrar-2.0.3.tgz",
       "integrity": "sha512-YA/A+o+166/+noXxMFXvZdg9soZSZX2EPOlUwnGXZWR7J5B2sxyP76QxHWXL5npsEMj7suP+Rjb/GJYGz7rDyg==",
       "requires": {
-        "@libp2p/interface-connection": "3.0.1",
+        "@libp2p/interface-connection": "^3.0.0",
         "@libp2p/interface-peer-id": "^1.0.0"
       }
     },
@@ -13002,7 +13042,7 @@
       "resolved": "https://registry.npmjs.org/@libp2p/interface-stream-muxer/-/interface-stream-muxer-2.0.2.tgz",
       "integrity": "sha512-BcLsV8ZVr34G32u/w4pgSAgFju9CTuBB9OJwgX6ugasYf6LtJ0a3m5Kwddy79lvvM/gBvVv/McpCr4mPxP4WWg==",
       "requires": {
-        "@libp2p/interface-connection": "3.0.1",
+        "@libp2p/interface-connection": "^3.0.0",
         "@libp2p/interfaces": "^3.0.0",
         "it-stream-types": "^1.0.4"
       }
@@ -13012,7 +13052,7 @@
       "resolved": "https://registry.npmjs.org/@libp2p/interface-transport/-/interface-transport-1.0.3.tgz",
       "integrity": "sha512-uwCWcrtKVHGUpgJdmkTgeSr4vpN3lp7lhdV7NybrgL9Ge8JZxTRbs7OlCltRwD+jZkYEb0c6xAHF8nXlBFv5rw==",
       "requires": {
-        "@libp2p/interface-connection": "3.0.1",
+        "@libp2p/interface-connection": "^3.0.0",
         "@libp2p/interfaces": "^3.0.0",
         "@multiformats/multiaddr": "^10.2.0",
         "it-stream-types": "^1.0.4"
@@ -13057,7 +13097,7 @@
       "integrity": "sha512-a4hUUzHaFUmk6hx0lV6dveyOmHlOqB/MwDJJfIDyHvDILb2ZXGLJaI3JnbMYqPCwOCeSFkKu8Ixw5HphffV0Aw==",
       "requires": {
         "@libp2p/components": "^2.0.0",
-        "@libp2p/interface-connection": "3.0.1",
+        "@libp2p/interface-connection": "^3.0.1",
         "@libp2p/interface-stream-muxer": "^2.0.0",
         "@libp2p/logger": "^2.0.0",
         "@libp2p/tracked-map": "^2.0.0",
@@ -13067,7 +13107,7 @@
         "it-pipe": "^2.0.3",
         "it-pushable": "^3.1.0",
         "it-stream-types": "^1.0.4",
-        "uint8arraylist": "2.3.2",
+        "uint8arraylist": "^2.1.1",
         "uint8arrays": "^3.0.0",
         "varint": "^6.0.0"
       },
@@ -13096,7 +13136,7 @@
         "it-reader": "^6.0.1",
         "it-stream-types": "^1.0.4",
         "p-defer": "^4.0.0",
-        "uint8arraylist": "2.3.2",
+        "uint8arraylist": "^2.3.1",
         "uint8arrays": "^3.0.0"
       },
       "dependencies": {
@@ -13138,7 +13178,7 @@
         "@libp2p/peer-id": "^1.0.0",
         "multiformats": "^9.6.3",
         "protons-runtime": "^3.1.0",
-        "uint8arraylist": "2.3.2",
+        "uint8arraylist": "^2.0.0",
         "uint8arrays": "^3.0.0"
       },
       "dependencies": {
@@ -13173,7 +13213,7 @@
           "integrity": "sha512-S1iSPQC0McdHKJRi0XcATBkWgwWPx46UDfrnshYDXBvGHSYqkFtn4MQ8Gatf67w7FzFtHivA+Hb0ZPq56upG8w==",
           "requires": {
             "protobufjs": "^7.0.0",
-            "uint8arraylist": "2.3.2"
+            "uint8arraylist": "^2.3.2"
           }
         }
       }
@@ -13200,7 +13240,7 @@
         "multiformats": "^9.6.3",
         "protons-runtime": "^3.1.0",
         "uint8-varint": "^1.0.2",
-        "uint8arraylist": "2.3.2",
+        "uint8arraylist": "^2.1.0",
         "uint8arrays": "^3.0.0",
         "varint": "^6.0.0"
       },
@@ -13211,7 +13251,7 @@
           "integrity": "sha512-RqF5jKukI8v3Q8MZb4d8/UVjg0OXbl0R8ErWi/LKf+uklA8kTA7rT4FQXFUBycxrkFmEu/tJnW+R1/4fwRwZVg==",
           "requires": {
             "@libp2p/interface-peer-id": "^1.0.0",
-            "uint8arraylist": "2.3.2"
+            "uint8arraylist": "^2.0.0"
           }
         },
         "interface-datastore": {
@@ -13260,7 +13300,7 @@
           "integrity": "sha512-S1iSPQC0McdHKJRi0XcATBkWgwWPx46UDfrnshYDXBvGHSYqkFtn4MQ8Gatf67w7FzFtHivA+Hb0ZPq56upG8w==",
           "requires": {
             "protobufjs": "^7.0.0",
-            "uint8arraylist": "2.3.2"
+            "uint8arraylist": "^2.3.2"
           }
         }
       }
@@ -13290,7 +13330,7 @@
         "mortice": "^3.0.0",
         "multiformats": "^9.6.3",
         "protons-runtime": "^3.1.0",
-        "uint8arraylist": "2.3.2",
+        "uint8arraylist": "^2.1.1",
         "uint8arrays": "^3.1.0"
       },
       "dependencies": {
@@ -13300,7 +13340,7 @@
           "integrity": "sha512-RqF5jKukI8v3Q8MZb4d8/UVjg0OXbl0R8ErWi/LKf+uklA8kTA7rT4FQXFUBycxrkFmEu/tJnW+R1/4fwRwZVg==",
           "requires": {
             "@libp2p/interface-peer-id": "^1.0.0",
-            "uint8arraylist": "2.3.2"
+            "uint8arraylist": "^2.0.0"
           }
         },
         "interface-datastore": {
@@ -13349,7 +13389,7 @@
           "integrity": "sha512-S1iSPQC0McdHKJRi0XcATBkWgwWPx46UDfrnshYDXBvGHSYqkFtn4MQ8Gatf67w7FzFtHivA+Hb0ZPq56upG8w==",
           "requires": {
             "protobufjs": "^7.0.0",
-            "uint8arraylist": "2.3.2"
+            "uint8arraylist": "^2.3.2"
           }
         }
       }
@@ -13361,7 +13401,7 @@
       "requires": {
         "@libp2p/components": "^2.0.0",
         "@libp2p/crypto": "^1.0.0",
-        "@libp2p/interface-connection": "3.0.1",
+        "@libp2p/interface-connection": "^3.0.1",
         "@libp2p/interface-peer-id": "^1.0.2",
         "@libp2p/interface-pubsub": "^2.0.0",
         "@libp2p/interface-registrar": "^2.0.0",
@@ -13378,7 +13418,7 @@
         "it-pushable": "^3.0.0",
         "multiformats": "^9.6.3",
         "p-queue": "^7.2.0",
-        "uint8arraylist": "2.3.2",
+        "uint8arraylist": "^2.0.0",
         "uint8arrays": "^3.0.0"
       },
       "dependencies": {
@@ -13416,7 +13456,7 @@
       "integrity": "sha512-qc1zGBb6Yrl/ihux8qmy+T3H9BymVGiZeam8b/Dr4jpHxV4mfYwySYXUxa6LZqhDp0WS2Es9B1v1UtsNRY5YxA==",
       "requires": {
         "@achingbrain/ip-address": "^8.1.0",
-        "@libp2p/interface-connection": "3.0.1",
+        "@libp2p/interface-connection": "^3.0.1",
         "@libp2p/interface-peer-store": "^1.0.0",
         "@libp2p/logger": "^2.0.0",
         "@multiformats/multiaddr": "^10.1.1",
@@ -13425,7 +13465,7 @@
         "is-loopback-addr": "^2.0.1",
         "it-stream-types": "^1.0.4",
         "private-ip": "^2.1.1",
-        "uint8arraylist": "2.3.2"
+        "uint8arraylist": "^2.3.2"
       }
     },
     "@libp2p/websockets": {
@@ -13433,7 +13473,7 @@
       "resolved": "https://registry.npmjs.org/@libp2p/websockets/-/websockets-3.0.3.tgz",
       "integrity": "sha512-fGbXpbyJaToA3Opc/lyw3C2xGlhDiabwQeQE6bTNTCpCFsBwOq8DwE4J++lkxnvJzKu0D4oC1c7oQrQ+4oq1Fw==",
       "requires": {
-        "@libp2p/interface-connection": "3.0.1",
+        "@libp2p/interface-connection": "^3.0.1",
         "@libp2p/interface-transport": "^1.0.0",
         "@libp2p/interfaces": "^3.0.1",
         "@libp2p/logger": "^2.0.0",
@@ -14831,7 +14871,7 @@
       "resolved": "https://registry.npmjs.org/byte-access/-/byte-access-1.0.1.tgz",
       "integrity": "sha512-GKYa+lvxnzhgHWj9X+LCsQ4s2/C5uvib573eAOiQKywXMkzFFErY2+yQdzmdE5iWVpmqecsRx3bOtOY4/1eINw==",
       "requires": {
-        "uint8arraylist": "2.3.2"
+        "uint8arraylist": "^2.0.0"
       }
     },
     "bytes-iec": {
@@ -17314,7 +17354,7 @@
         "it-reader": "^6.0.1",
         "it-stream-types": "^1.0.4",
         "p-defer": "^4.0.0",
-        "uint8arraylist": "2.3.2"
+        "uint8arraylist": "^2.0.0"
       },
       "dependencies": {
         "it-pushable": {
@@ -17332,7 +17372,7 @@
         "err-code": "^3.0.1",
         "it-stream-types": "^1.0.4",
         "uint8-varint": "^1.0.1",
-        "uint8arraylist": "2.3.2",
+        "uint8arraylist": "^2.0.0",
         "uint8arrays": "^3.0.0"
       }
     },
@@ -17366,7 +17406,7 @@
         "it-handshake": "^4.1.2",
         "it-length-prefixed": "^8.0.2",
         "it-stream-types": "^1.0.4",
-        "uint8arraylist": "2.3.2"
+        "uint8arraylist": "^2.0.0"
       }
     },
     "it-pipe": {
@@ -17400,7 +17440,7 @@
       "integrity": "sha512-C+YRk3OTufbKSJMNEonfEw+9F38llmwwZvqhkjb0xIgob7l4L3p01Yt43+bHRI8SSppAOgk5AKLqas7ea0UTAw==",
       "requires": {
         "it-stream-types": "^1.0.4",
-        "uint8arraylist": "2.3.2"
+        "uint8arraylist": "^2.0.0"
       }
     },
     "it-sort": {
@@ -17675,7 +17715,7 @@
         "@libp2p/connection": "^4.0.1",
         "@libp2p/crypto": "^1.0.3",
         "@libp2p/interface-address-manager": "^1.0.2",
-        "@libp2p/interface-connection": "3.0.1",
+        "@libp2p/interface-connection": "^3.0.1",
         "@libp2p/interface-connection-encrypter": "^2.0.1",
         "@libp2p/interface-content-routing": "^1.0.2",
         "@libp2p/interface-dht": "^1.0.1",
@@ -17734,7 +17774,7 @@
         "sanitize-filename": "^1.6.3",
         "set-delayed-interval": "^1.0.0",
         "timeout-abort-controller": "^3.0.0",
-        "uint8arraylist": "2.3.2",
+        "uint8arraylist": "^2.3.2",
         "uint8arrays": "^3.0.0",
         "wherearewe": "^2.0.0",
         "xsalsa20": "^1.1.0"
@@ -17795,7 +17835,7 @@
           "integrity": "sha512-S1iSPQC0McdHKJRi0XcATBkWgwWPx46UDfrnshYDXBvGHSYqkFtn4MQ8Gatf67w7FzFtHivA+Hb0ZPq56upG8w==",
           "requires": {
             "protobufjs": "^7.0.0",
-            "uint8arraylist": "2.3.2"
+            "uint8arraylist": "^2.3.2"
           }
         }
       }
@@ -18125,7 +18165,7 @@
       "integrity": "sha512-22U2exkkYy7sr7nuQJYx2NEZ2kEMsC69+BxM5h8auLvkVIJa+LwAB5mFIExnuW2dFuYXFOWsFMKXjaWiq/htYQ==",
       "requires": {
         "byte-access": "^1.0.1",
-        "uint8arraylist": "2.3.2"
+        "uint8arraylist": "^2.0.0"
       }
     },
     "loose-envify": {
@@ -19260,8 +19300,18 @@
       "resolved": "https://registry.npmjs.org/protons-runtime/-/protons-runtime-1.0.4.tgz",
       "integrity": "sha512-DSKWjAgwaXhtYO5Jo/MrU8n/75I/P2IhxU0Fk/lSrXx6Gxl5DH+I6cHcbGAYFmAlOBmU4QRa0mvVme8VXlDeUg==",
       "requires": {
-        "uint8arraylist": "2.3.2",
+        "uint8arraylist": "^1.4.0",
         "uint8arrays": "^3.0.0"
+      },
+      "dependencies": {
+        "uint8arraylist": {
+          "version": "1.6.0",
+          "resolved": "https://registry.npmjs.org/uint8arraylist/-/uint8arraylist-1.6.0.tgz",
+          "integrity": "sha512-QOh6SQJQj/eEqQ6NJ8SI9LH875uI2ShcOtWE3Yupci0RaHsZm4oP+mUCJzBzKkp+8gCK7M4l+6Ubvlaimt7CSw==",
+          "requires": {
+            "uint8arrays": "^3.0.0"
+          }
+        }
       }
     },
     "proxy-from-env": {
@@ -20568,7 +20618,7 @@
       "requires": {
         "byte-access": "^1.0.0",
         "longbits": "^1.1.0",
-        "uint8arraylist": "2.3.2"
+        "uint8arraylist": "^2.0.0"
       }
     },
     "uint8arraylist": {
diff --git a/package.json b/package.json
index 5638a8bb09..98e7f5117a 100644
--- a/package.json
+++ b/package.json
@@ -169,10 +169,6 @@
     "typedoc": "^0.23.10",
     "typescript": "^4.5.5"
   },
-  "overrides": {
-    "@libp2p/interface-connection": "3.0.1",
-    "uint8arraylist": "2.3.2"
-  },
   "files": [
     "dist",
     "bundle",
diff --git a/src/lib/waku_store/index.ts b/src/lib/waku_store/index.ts
index d6604f3ffc..111c431acc 100644
--- a/src/lib/waku_store/index.ts
+++ b/src/lib/waku_store/index.ts
@@ -15,7 +15,7 @@ import { DecryptionMethod, WakuMessage } from "../waku_message";
 
 import { HistoryRPC, PageDirection } from "./history_rpc";
 
-import Error = HistoryResponse.Error;
+import Error = HistoryResponse.HistoryError;
 
 const dbg = debug("waku:store");
 
diff --git a/src/proto/store_v2beta3.proto b/src/proto/store_v2beta3.proto
index 8bd89ed1a2..88c37659ba 100644
--- a/src/proto/store_v2beta3.proto
+++ b/src/proto/store_v2beta3.proto
@@ -33,11 +33,11 @@ message HistoryQuery {
 message HistoryResponse {
   repeated WakuMessage messages = 2;
   optional PagingInfo paging_info = 3;
-  enum Error {
+  enum HistoryError {
     ERROR_NONE_UNSPECIFIED = 0;
     ERROR_INVALID_CURSOR = 1;
   }
-  optional Error error = 4;
+  optional HistoryError error = 4;
 }
 
 message HistoryRPC {
diff --git a/src/proto/store_v2beta3.ts b/src/proto/store_v2beta3.ts
index 800de7f5c3..6b0e265f06 100644
--- a/src/proto/store_v2beta3.ts
+++ b/src/proto/store_v2beta3.ts
@@ -138,23 +138,23 @@ export namespace HistoryQuery {
 export interface HistoryResponse {
   messages: WakuMessage[];
   pagingInfo?: PagingInfo;
-  error?: HistoryResponse.Error;
+  error?: HistoryResponse.HistoryError;
 }
 
 export namespace HistoryResponse {
-  export enum Error {
+  export enum HistoryError {
     ERROR_NONE_UNSPECIFIED = "ERROR_NONE_UNSPECIFIED",
     ERROR_INVALID_CURSOR = "ERROR_INVALID_CURSOR",
   }
 
-  enum __ErrorValues {
+  enum __HistoryErrorValues {
     ERROR_NONE_UNSPECIFIED = 0,
     ERROR_INVALID_CURSOR = 1,
   }
 
-  export namespace Error {
+  export namespace HistoryError {
     export const codec = () => {
-      return enumeration<typeof Error>(__ErrorValues);
+      return enumeration<typeof HistoryError>(__HistoryErrorValues);
     };
   }
 
@@ -164,7 +164,7 @@ export namespace HistoryResponse {
       3: { name: "pagingInfo", codec: PagingInfo.codec(), optional: true },
       4: {
         name: "error",
-        codec: HistoryResponse.Error.codec(),
+        codec: HistoryResponse.HistoryError.codec(),
         optional: true,
       },
     });
diff --git a/src/proto/store_v2beta4.proto b/src/proto/store_v2beta4.proto
index 337c21200d..db6cefb98b 100644
--- a/src/proto/store_v2beta4.proto
+++ b/src/proto/store_v2beta4.proto
@@ -34,11 +34,11 @@ message HistoryQuery {
 message HistoryResponse {
   repeated WakuMessage messages = 2;
   optional PagingInfo paging_info = 3;
-  enum Error {
+  enum HistoryError {
     ERROR_NONE_UNSPECIFIED = 0;
     ERROR_INVALID_CURSOR = 1;
   }
-  optional Error error = 4;
+  optional HistoryError error = 4;
 }
 
 message HistoryRPC {
diff --git a/src/proto/store_v2beta4.ts b/src/proto/store_v2beta4.ts
index 256da55a43..aefe39910a 100644
--- a/src/proto/store_v2beta4.ts
+++ b/src/proto/store_v2beta4.ts
@@ -140,23 +140,23 @@ export namespace HistoryQuery {
 export interface HistoryResponse {
   messages: WakuMessage[];
   pagingInfo?: PagingInfo;
-  error?: HistoryResponse.Error;
+  error?: HistoryResponse.HistoryError;
 }
 
 export namespace HistoryResponse {
-  export enum Error {
+  export enum HistoryError {
     ERROR_NONE_UNSPECIFIED = "ERROR_NONE_UNSPECIFIED",
     ERROR_INVALID_CURSOR = "ERROR_INVALID_CURSOR",
   }
 
-  enum __ErrorValues {
+  enum __HistoryErrorValues {
     ERROR_NONE_UNSPECIFIED = 0,
     ERROR_INVALID_CURSOR = 1,
   }
 
-  export namespace Error {
+  export namespace HistoryError {
     export const codec = () => {
-      return enumeration<typeof Error>(__ErrorValues);
+      return enumeration<typeof HistoryError>(__HistoryErrorValues);
     };
   }
 
@@ -166,7 +166,7 @@ export namespace HistoryResponse {
       3: { name: "pagingInfo", codec: PagingInfo.codec(), optional: true },
       4: {
         name: "error",
-        codec: HistoryResponse.Error.codec(),
+        codec: HistoryResponse.HistoryError.codec(),
         optional: true,
       },
     });