diff --git a/sites/shared/components/sets/set-candidate.mjs b/sites/shared/components/sets/set-candidate.mjs
index 5b68004c1cf..e91bfa27e4f 100644
--- a/sites/shared/components/sets/set-candidate.mjs
+++ b/sites/shared/components/sets/set-candidate.mjs
@@ -3,14 +3,17 @@ import { ChoiceLink } from 'shared/components/choice-link.mjs'
 import { OkIcon, NoIcon, WarningIcon } from 'shared/components/icons.mjs'
 import { useTranslation } from 'next-i18next'
 import { capitalize } from 'shared/utils.mjs'
+import Image from 'next/image'
 
 export const ns = ['sets']
 
 const Title = ({ set, language }) => (
   <div className="flex flex-row items-center gap-2">
-    <img
+    <Image
       alt="img"
-      src={set.img}
+      src={set.img || ''}
+      width={100}
+      height={100}
       className="shadow mask mask-squircle bg-neutral aspect-square w-12 h-12"
     />
     <span>{set[`name${language ? capitalize(language) : ''}`]}</span>
@@ -58,7 +61,10 @@ export const SetCandidate = ({
   // Proper check for required measurements
   if (hasMeasies) {
     for (const m of requiredMeasies) {
-      if (!Object.keys(set.measies).includes(m)) return <SetLacksMeasies {...setProps} />
+      if (!Object.keys(set.measies).includes(m)) {
+        hasMeasies = false
+        break
+      }
     }
   }
 
diff --git a/sites/shared/components/sets/set-picker.mjs b/sites/shared/components/sets/set-picker.mjs
index 7dd5c116e3c..56aabb65944 100644
--- a/sites/shared/components/sets/set-picker.mjs
+++ b/sites/shared/components/sets/set-picker.mjs
@@ -43,7 +43,7 @@ export const CuratedSetPicker = ({ design, language, href, clickHandler }) => {
       }
     }
     getCuratedSets()
-  }, [])
+  }, [backend, language])
 
   const addFilter = (tag) => {
     const newFilter = [...filter, tag]
@@ -136,7 +136,7 @@ export const UserSetPicker = ({ design, t, href, clickHandler }) => {
       }
     }
     getSets()
-  }, [])
+  })
 
   return Object.keys(sets).length < 1 ? (
     <PopoutWrapper tip noP>