diff --git a/src/components/EventTooltip.svelte b/src/components/EventTooltip.svelte
index 3f72341..6d4ee0d 100644
--- a/src/components/EventTooltip.svelte
+++ b/src/components/EventTooltip.svelte
@@ -13,6 +13,7 @@
     sourceCategoryFilter,
     tagFilter,
     textSearchFilter,
+    highlightPolarization,
     selectAllFilters} from '../stores/filters';
   import { maxScores } from '../inputs/scores';
   import { images } from '../inputs/dataPaths';
@@ -184,16 +185,16 @@
           {:else}
             <ul>
               <ImpactStrip value={$tooltip.tp.smiFacebook}
-                           polarization={$tooltip.tp.polarization}
+                           polarization={$highlightPolarization ? $tooltip.tp.polarization : null}
                            label="Facebook" />
               <ImpactStrip value={$tooltip.tp.smiTwitter}
-                           polarization={$tooltip.tp.polarization}
+                           polarization={$highlightPolarization ? $tooltip.tp.polarization : null}
                            label="Twitter" />
               <ImpactStrip value={$tooltip.tp.smiReddit}
-                           polarization={$tooltip.tp.polarization}
+                           polarization={$highlightPolarization ? $tooltip.tp.polarization : null}
                            label="Reddit" />
             </ul>
-            {#if ($tooltip.tp.polarization.fulfills10Articles || $tooltip.tp.polarization.fulfills25Percent)}
+            {#if ($highlightPolarization && ($tooltip.tp.polarization.fulfills10Articles || $tooltip.tp.polarization.fulfills25Percent))}
               <PolarizationLegend />
             {/if}
           {/if}
diff --git a/src/components/ImpactStrip.svelte b/src/components/ImpactStrip.svelte
index 9d1498a..10a5a0c 100644
--- a/src/components/ImpactStrip.svelte
+++ b/src/components/ImpactStrip.svelte
@@ -20,7 +20,7 @@
   <span class="smi-label">
     {label}
   </span>
-  {#if ((polarization.fulfills10Articles || polarization.fulfills25Percent) && value > 0)}
+  {#if (polarization && (polarization.fulfills10Articles || polarization.fulfills25Percent) && value > 0)}
     <PolarizationStrip polarization={polarization[label.toLowerCase()]}
                        smi={value}
                        valueWidth={valueWidth} />