diff --git a/package-lock.json b/package-lock.json
index 38d14f57..e9d697b9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4040,8 +4040,8 @@
       "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU="
     },
     "windshaft": {
-      "version": "github:cartodb/windshaft#1901a16f06e4ffa4b53594e1da1e81b3b383d7ea",
-      "from": "github:cartodb/windshaft#master",
+      "version": "github:cartodb/windshaft#101e3a5093c834262381fad768a37b0a1e24de4a",
+      "from": "github:cartodb/windshaft#fix-windshaft-cartodb-assertion",
       "requires": {
         "@carto/cartonik": "^0.6.1",
         "@carto/mapnik": "3.6.2-carto.16",
diff --git a/package.json b/package.json
index 3e4eb766..3bda019a 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
     "step-profiler": "0.3.0",
     "turbo-carto": "0.21.2",
     "underscore": "1.6.0",
-    "windshaft": "github:cartodb/windshaft#master",
+    "windshaft": "github:cartodb/windshaft#fix-windshaft-cartodb-assertion",
     "yargs": "11.1.0"
   },
   "devDependencies": {