diff --git a/CHANGELOG.md b/CHANGELOG.md
index 562bc8a4b..dca872e8f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# [1.36.0-develop.8](https://github.com/WatWowMap/ReactMap/compare/v1.36.0-develop.7...v1.36.0-develop.8) (2024-12-22)
+
+
+### Bug Fixes
+
+* always add 0 form ([31900e2](https://github.com/WatWowMap/ReactMap/commit/31900e21796dbe8b9063a51c05c7d772678a86f5))
+* form can be unset for quests ([b83c493](https://github.com/WatWowMap/ReactMap/commit/b83c493bfdd182503501207a97f76a64911dd0a3))
+
 # [1.36.0-develop.7](https://github.com/WatWowMap/ReactMap/compare/v1.36.0-develop.6...v1.36.0-develop.7) (2024-12-20)
 
 
diff --git a/package.json b/package.json
index 7ea510c73..d90d56c94 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "reactmap",
-  "version": "1.36.0-develop.7",
+  "version": "1.36.0-develop.8",
   "private": true,
   "description": "React based frontend map.",
   "license": "MIT",
diff --git a/server/src/filters/builder/pokemon.js b/server/src/filters/builder/pokemon.js
index 424db49d6..6a2fc5c58 100644
--- a/server/src/filters/builder/pokemon.js
+++ b/server/src/filters/builder/pokemon.js
@@ -41,10 +41,9 @@ function buildPokemon(defaults, base, custom) {
       pokemon.stations[`${id}-${form}`] = new BaseFilter(
         defaults.stations.pokemon,
       )
-      if (form !== '0')
-        pokemon.quests[`${id}-${form}`] = new BaseFilter(
-          defaults.pokestops.pokemon,
-        )
+      pokemon.quests[`${id}-${form}`] = new BaseFilter(
+        defaults.pokestops.pokemon,
+      )
       if (state.db.filterContext.Pokestop.hasConfirmedInvasions) {
         pokemon.rocket[`a${id}-${form}`] = new BaseFilter(
           defaults.pokestops.invasionPokemon,
diff --git a/server/src/services/EventManager.js b/server/src/services/EventManager.js
index b996b4777..51cde7aa7 100644
--- a/server/src/services/EventManager.js
+++ b/server/src/services/EventManager.js
@@ -404,6 +404,7 @@ class EventManager extends Logger {
     this.available[category].forEach((item) => {
       if (!Number.isNaN(parseInt(item.charAt(0)))) {
         const [id, form] = item.split('-')
+        const formId = form || '0'
         if (!this.masterfile.pokemon[id]) {
           this.masterfile.pokemon[id] = {
             name: '',
@@ -411,7 +412,7 @@ class EventManager extends Logger {
             types: [],
             quickMoves: [],
             chargedMoves: [],
-            defaultFormId: +form,
+            defaultFormId: +formId,
             forms: {},
             genId: 0,
           }
@@ -420,8 +421,8 @@ class EventManager extends Logger {
         if (!this.masterfile.pokemon[id].forms) {
           this.masterfile.pokemon[id].forms = {}
         }
-        if (!this.masterfile.pokemon[id].forms[form]) {
-          this.masterfile.pokemon[id].forms[form] = { name: '*', category }
+        if (!this.masterfile.pokemon[id].forms[formId]) {
+          this.masterfile.pokemon[id].forms[formId] = { name: '*', category }
           this.log.debug(
             `Added ${this.masterfile.pokemon[id].name} Key: ${item} to masterfile. (${category})`,
           )