diff --git a/geonode_mapstore_client/client/MapStore2 b/geonode_mapstore_client/client/MapStore2
index 3d0f4ce492..8d9678ae60 160000
--- a/geonode_mapstore_client/client/MapStore2
+++ b/geonode_mapstore_client/client/MapStore2
@@ -1 +1 @@
-Subproject commit 3d0f4ce49281cfb98c841c399bae6d92816cd238
+Subproject commit 8d9678ae60f4527310c9b3d0b3cdd05f6ee78305
diff --git a/geonode_mapstore_client/client/package.json b/geonode_mapstore_client/client/package.json
index 8ccb3d4d8a..c367793ceb 100644
--- a/geonode_mapstore_client/client/package.json
+++ b/geonode_mapstore_client/client/package.json
@@ -27,7 +27,7 @@
   "author": "GeoSolutions",
   "license": "BSD-2-Clause",
   "devDependencies": {
-    "@mapstore/project": "git+https://github.com/geosolutions-it/mapstore-project.git#master",
+    "@mapstore/project": "git+https://github.com/geosolutions-it/mapstore-project.git#geonode-5.0.x",
     "dotenv": "10.0.0",
     "jsdoc": "4.0.0"
   },