diff --git a/mage/Dockerfile b/mage/Dockerfile
index 4dfa67bf8..dcefc3159 100644
--- a/mage/Dockerfile
+++ b/mage/Dockerfile
@@ -41,7 +41,7 @@ RUN cd .wasp/build/server && npm run bundle
 # TODO: Use pm2?
 # TODO: Use non-root user (node).
 FROM base AS server-production
-RUN curl -sSL https://get.wasp-lang.dev/installer.sh | sh -s -- -v 0.12.1
+RUN curl -sSL https://get.wasp-lang.dev/installer.sh | sh -s -- -v 0.12.2
 ENV PATH "$PATH:/root/.local/bin"
 ENV NODE_ENV production
 WORKDIR /app
diff --git a/waspc/ChangeLog.md b/waspc/ChangeLog.md
index 07af750f7..1ab75cdc7 100644
--- a/waspc/ChangeLog.md
+++ b/waspc/ChangeLog.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.12.2
+
+### 🐞 Bug fixes
+
+- We were adding Crypto polyfill even when not needed (when node > 18), which was then causing an error. Now polyfill is added only if needed.
+
 ## 0.12.1
 
 ### 🐞 Bug fixes
diff --git a/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/.waspchecksums b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/.waspchecksums
index 4531f025a..f39591a58 100644
--- a/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/.waspchecksums
+++ b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/.waspchecksums
@@ -466,7 +466,7 @@
             "file",
             "server/src/polyfill.ts"
         ],
-        "4ab1dcc0b102d76e98710af39a41bfee93be96ba04d9d84a58cd50ffa73b6c11"
+        "1149661e0aa7228b184bb2c04ac63232a6523b09b33829db6977f79daba3fd8d"
     ],
     [
         [
diff --git a/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/server/src/polyfill.ts b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/server/src/polyfill.ts
index 02edd2a4a..7931d12eb 100644
--- a/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/server/src/polyfill.ts
+++ b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/server/src/polyfill.ts
@@ -3,6 +3,7 @@
 
 import { webcrypto } from "node:crypto";
 
+// NOTE: node < 19 doesn't have Crypto API, which we need for Lucia, so we apply the polyfill if Crypto API is not defined.
 if (typeof globalThis.crypto === "undefined") {
   // @ts-ignore
   globalThis.crypto = webcrypto as Crypto;
diff --git a/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/main.wasp b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/main.wasp
index 1fe8c4540..48c81b6e9 100644
--- a/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/main.wasp
+++ b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/main.wasp
@@ -1,7 +1,7 @@
 app waspBuild {
   db: { system: PostgreSQL },
   wasp: {
-    version: "^0.12.1"
+    version: "^0.12.2"
   },
   title: "waspBuild"
 }
diff --git a/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/.waspchecksums b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/.waspchecksums
index c142b7c27..da78073f1 100644
--- a/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/.waspchecksums
+++ b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/.waspchecksums
@@ -473,7 +473,7 @@
             "file",
             "server/src/polyfill.ts"
         ],
-        "4ab1dcc0b102d76e98710af39a41bfee93be96ba04d9d84a58cd50ffa73b6c11"
+        "1149661e0aa7228b184bb2c04ac63232a6523b09b33829db6977f79daba3fd8d"
     ],
     [
         [
diff --git a/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/server/src/polyfill.ts b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/server/src/polyfill.ts
index 02edd2a4a..7931d12eb 100644
--- a/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/server/src/polyfill.ts
+++ b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/server/src/polyfill.ts
@@ -3,6 +3,7 @@
 
 import { webcrypto } from "node:crypto";
 
+// NOTE: node < 19 doesn't have Crypto API, which we need for Lucia, so we apply the polyfill if Crypto API is not defined.
 if (typeof globalThis.crypto === "undefined") {
   // @ts-ignore
   globalThis.crypto = webcrypto as Crypto;
diff --git a/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/main.wasp b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/main.wasp
index c22ee057a..430a3391b 100644
--- a/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/main.wasp
+++ b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/main.wasp
@@ -1,6 +1,6 @@
 app waspCompile {
   wasp: {
-    version: "^0.12.1"
+    version: "^0.12.2"
   },
   title: "waspCompile"
 }
diff --git a/waspc/e2e-test/test-outputs/waspComplexTest-golden/waspComplexTest/.wasp/out/.waspchecksums b/waspc/e2e-test/test-outputs/waspComplexTest-golden/waspComplexTest/.wasp/out/.waspchecksums
index 3ec0c72ff..45ad3216a 100644
--- a/waspc/e2e-test/test-outputs/waspComplexTest-golden/waspComplexTest/.wasp/out/.waspchecksums
+++ b/waspc/e2e-test/test-outputs/waspComplexTest-golden/waspComplexTest/.wasp/out/.waspchecksums
@@ -935,7 +935,7 @@
             "file",
             "server/src/polyfill.ts"
         ],
-        "4ab1dcc0b102d76e98710af39a41bfee93be96ba04d9d84a58cd50ffa73b6c11"
+        "1149661e0aa7228b184bb2c04ac63232a6523b09b33829db6977f79daba3fd8d"
     ],
     [
         [
diff --git a/waspc/e2e-test/test-outputs/waspComplexTest-golden/waspComplexTest/.wasp/out/server/src/polyfill.ts b/waspc/e2e-test/test-outputs/waspComplexTest-golden/waspComplexTest/.wasp/out/server/src/polyfill.ts
index 02edd2a4a..7931d12eb 100644
--- a/waspc/e2e-test/test-outputs/waspComplexTest-golden/waspComplexTest/.wasp/out/server/src/polyfill.ts
+++ b/waspc/e2e-test/test-outputs/waspComplexTest-golden/waspComplexTest/.wasp/out/server/src/polyfill.ts
@@ -3,6 +3,7 @@
 
 import { webcrypto } from "node:crypto";
 
+// NOTE: node < 19 doesn't have Crypto API, which we need for Lucia, so we apply the polyfill if Crypto API is not defined.
 if (typeof globalThis.crypto === "undefined") {
   // @ts-ignore
   globalThis.crypto = webcrypto as Crypto;
diff --git a/waspc/e2e-test/test-outputs/waspComplexTest-golden/waspComplexTest/main.wasp b/waspc/e2e-test/test-outputs/waspComplexTest-golden/waspComplexTest/main.wasp
index 67d226ec4..7a68a4659 100644
--- a/waspc/e2e-test/test-outputs/waspComplexTest-golden/waspComplexTest/main.wasp
+++ b/waspc/e2e-test/test-outputs/waspComplexTest-golden/waspComplexTest/main.wasp
@@ -1,7 +1,7 @@
 app waspComplexTest {
   db: { system: PostgreSQL },
   wasp: {
-    version: "^0.12.1"
+    version: "^0.12.2"
   },
   auth: {
     userEntity: User,
diff --git a/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/.waspchecksums b/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/.waspchecksums
index 1736b1e8d..7566cf2c5 100644
--- a/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/.waspchecksums
+++ b/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/.waspchecksums
@@ -543,7 +543,7 @@
             "file",
             "server/src/polyfill.ts"
         ],
-        "4ab1dcc0b102d76e98710af39a41bfee93be96ba04d9d84a58cd50ffa73b6c11"
+        "1149661e0aa7228b184bb2c04ac63232a6523b09b33829db6977f79daba3fd8d"
     ],
     [
         [
diff --git a/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/server/src/polyfill.ts b/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/server/src/polyfill.ts
index 02edd2a4a..7931d12eb 100644
--- a/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/server/src/polyfill.ts
+++ b/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/server/src/polyfill.ts
@@ -3,6 +3,7 @@
 
 import { webcrypto } from "node:crypto";
 
+// NOTE: node < 19 doesn't have Crypto API, which we need for Lucia, so we apply the polyfill if Crypto API is not defined.
 if (typeof globalThis.crypto === "undefined") {
   // @ts-ignore
   globalThis.crypto = webcrypto as Crypto;
diff --git a/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/main.wasp b/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/main.wasp
index 19aa8d024..190e05a81 100644
--- a/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/main.wasp
+++ b/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/main.wasp
@@ -1,7 +1,7 @@
 app waspJob {
   db: { system: PostgreSQL },
   wasp: {
-    version: "^0.12.1"
+    version: "^0.12.2"
   },
   title: "waspJob"
 }
diff --git a/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/.wasp/out/.waspchecksums b/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/.wasp/out/.waspchecksums
index d5198dc43..e2fae65af 100644
--- a/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/.wasp/out/.waspchecksums
+++ b/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/.wasp/out/.waspchecksums
@@ -473,7 +473,7 @@
             "file",
             "server/src/polyfill.ts"
         ],
-        "4ab1dcc0b102d76e98710af39a41bfee93be96ba04d9d84a58cd50ffa73b6c11"
+        "1149661e0aa7228b184bb2c04ac63232a6523b09b33829db6977f79daba3fd8d"
     ],
     [
         [
diff --git a/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/.wasp/out/server/src/polyfill.ts b/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/.wasp/out/server/src/polyfill.ts
index 02edd2a4a..7931d12eb 100644
--- a/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/.wasp/out/server/src/polyfill.ts
+++ b/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/.wasp/out/server/src/polyfill.ts
@@ -3,6 +3,7 @@
 
 import { webcrypto } from "node:crypto";
 
+// NOTE: node < 19 doesn't have Crypto API, which we need for Lucia, so we apply the polyfill if Crypto API is not defined.
 if (typeof globalThis.crypto === "undefined") {
   // @ts-ignore
   globalThis.crypto = webcrypto as Crypto;
diff --git a/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/main.wasp b/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/main.wasp
index 993d75e69..41521325a 100644
--- a/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/main.wasp
+++ b/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/main.wasp
@@ -1,6 +1,6 @@
 app waspMigrate {
   wasp: {
-    version: "^0.12.1"
+    version: "^0.12.2"
   },
   title: "waspMigrate"
 }
diff --git a/waspc/e2e-test/test-outputs/waspNew-golden/waspNew/main.wasp b/waspc/e2e-test/test-outputs/waspNew-golden/waspNew/main.wasp
index 263867d7b..57f35787a 100644
--- a/waspc/e2e-test/test-outputs/waspNew-golden/waspNew/main.wasp
+++ b/waspc/e2e-test/test-outputs/waspNew-golden/waspNew/main.wasp
@@ -1,6 +1,6 @@
 app waspNew {
   wasp: {
-    version: "^0.12.1"
+    version: "^0.12.2"
   },
   title: "waspNew"
 }
diff --git a/waspc/waspc.cabal b/waspc/waspc.cabal
index bff284703..2140faacf 100644
--- a/waspc/waspc.cabal
+++ b/waspc/waspc.cabal
@@ -6,7 +6,7 @@ cabal-version: 2.4
 --    Consider using hpack, or maybe even hpack-dhall.
 
 name:           waspc
-version:        0.12.1
+version:        0.12.2
 description:    Please see the README on GitHub at <https://github.com/wasp-lang/wasp/waspc#readme>
 homepage:       https://github.com/wasp-lang/wasp/waspc#readme
 bug-reports:    https://github.com/wasp-lang/wasp/issues