diff --git a/src/amo/components/AddonBadges/index.js b/src/amo/components/AddonBadges/index.js
index 0f61e38aecc..a0bf18e9f15 100644
--- a/src/amo/components/AddonBadges/index.js
+++ b/src/amo/components/AddonBadges/index.js
@@ -53,8 +53,12 @@ export class AddonBadgesBase extends React.Component<InternalProps> {
 
     return (
       <div className="AddonBadges">
-        {promotedCategories.forEach((category) => (
-          <PromotedBadge category={category} size="large" />
+        {promotedCategories.map((category) => (
+          <PromotedBadge
+            key={`${addon.name}-${category}`}
+            category={category}
+            size="large"
+          />
         ))}
         {addon.is_experimental ? (
           <Badge type="experimental" label={i18n.gettext('Experimental')} />
diff --git a/src/amo/components/InstallWarning/index.js b/src/amo/components/InstallWarning/index.js
index 36c1bf706b4..e3bf9caf3c0 100644
--- a/src/amo/components/InstallWarning/index.js
+++ b/src/amo/components/InstallWarning/index.js
@@ -86,10 +86,9 @@ export class InstallWarningBase extends React.Component<InternalProps> {
       !correctedLocation &&
       isFirefox({ userAgentInfo }) &&
       addon.type === ADDON_TYPE_EXTENSION &&
-      (!promotedCategories ||
-        promotedCategories.some(
-          (promoted) => !EXCLUDE_WARNING_CATEGORIES.includes(promoted),
-        ))
+      promotedCategories.some(
+        (promoted) => !EXCLUDE_WARNING_CATEGORIES.includes(promoted),
+      )
     );
   };
 
diff --git a/src/amo/components/SearchSuggestion/index.js b/src/amo/components/SearchSuggestion/index.js
index b296217b1ae..549e647c773 100644
--- a/src/amo/components/SearchSuggestion/index.js
+++ b/src/amo/components/SearchSuggestion/index.js
@@ -52,14 +52,15 @@ export const SearchSuggestionBase = ({
       <span className="SearchSuggestion-name">
         {loading ? <LoadingText minWidth={20} /> : name}
       </span>
-      {promotedCategories.forEach((category) => {
+      {promotedCategories.map((category) => (
         <IconPromotedBadge
+          key={`${suggestion.name}-${category}`}
           category={category}
           className="SearchSuggestion-icon-promoted"
           showAlt
           size="small"
-        />;
-      })}
+        />
+      ))}
       <Icon
         alt={arrowAlt}
         className="SearchSuggestion-icon-arrow"