diff --git a/components/FilterModal/index.tsx b/components/FilterModal/index.tsx
index a4644aa5..af4537cf 100644
--- a/components/FilterModal/index.tsx
+++ b/components/FilterModal/index.tsx
@@ -61,14 +61,14 @@ const FilterModal = (props: Props) => {
   const [fullAuto, setFullAuto] = useState(props.defaultFilterSet.full_auto)
   const [autoGuard, setAutoGuard] = useState(props.defaultFilterSet.auto_guard)
   const [chargeAttack, setChargeAttack] = useState(
-    props.filterSet.charge_attack
+    props.defaultFilterSet.charge_attack
   )
 
   const [minCharacterCount, setMinCharacterCount] = useState(
-    props.filterSet.characters_count
+    props.defaultFilterSet.characters_count
   )
   const [minWeaponCount, setMinWeaponCount] = useState(
-    props.filterSet.weapons_count
+    props.defaultFilterSet.weapons_count
   )
   const [minSummonCount, setMinSummonCount] = useState(
     props.filterSet.summons_count
@@ -77,17 +77,18 @@ const FilterModal = (props: Props) => {
     props.defaultFilterSet.summons_count
 
   const [maxButtonsCount, setMaxButtonsCount] = useState(
-    props.filterSet.button_count
+    props.defaultFilterSet.button_count
   )
-  const [maxTurnsCount, setMaxTurnsCount] = useState(props.filterSet.turn_count)
-
-  const [userQuality, setUserQuality] = useState(props.filterSet.user_quality)
+  const [maxTurnsCount, setMaxTurnsCount] = useState(
+    props.defaultFilterSet.turn_count
+  )
+  const [userQuality, setUserQuality] = useState(
     props.defaultFilterSet.user_quality
   )
-  const [nameQuality, setNameQuality] = useState(props.filterSet.name_quality)
+  const [nameQuality, setNameQuality] = useState(
     props.defaultFilterSet.name_quality
   )
-  const [originalOnly, setOriginalOnly] = useState(props.filterSet.original)
+  const [originalOnly, setOriginalOnly] = useState(
     props.defaultFilterSet.original
   )