diff --git a/packages/volto-slate-glossary/src/components/Tooltips.jsx b/packages/volto-slate-glossary/src/components/Tooltips.jsx
index bc7910c..e87d316 100644
--- a/packages/volto-slate-glossary/src/components/Tooltips.jsx
+++ b/packages/volto-slate-glossary/src/components/Tooltips.jsx
@@ -1,3 +1,4 @@
+import React from 'react';
 import { useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import jwtDecode from 'jwt-decode';
@@ -60,7 +61,14 @@ const Tooltips = (props) => {
       // Store texts and pathname in atom
       setTooltippedTexts({ pathname: pathname, texts: texts });
     }
-  }, [blocks, blocks_layout, glossaryterms, pathname, setTooltippedTexts]);
+  }, [
+    blocks,
+    blocks_layout,
+    description,
+    glossaryterms,
+    pathname,
+    setTooltippedTexts,
+  ]);
 
   return <div className="hidden-AppExtras-CalculateTexts"></div>;
 };
@@ -184,7 +192,9 @@ export const enhanceTextWithTooltips = (text, remainingGlossaryterms) => {
             definition = `<ol>${arrayOfListNodes}</ol>`;
         }
         const TooltipPopup = config.getComponent('TooltipPopup').component;
-        return <TooltipPopup term={el.val} definition={definition} idx={j} />;
+        return (
+          <TooltipPopup term={el.val} definition={definition} idx={j} key={j} />
+        );
       }
     }),
     matchOnlyFirstOccurence
diff --git a/packages/volto-slate-glossary/src/index.js b/packages/volto-slate-glossary/src/index.js
index 1db0471..7856183 100644
--- a/packages/volto-slate-glossary/src/index.js
+++ b/packages/volto-slate-glossary/src/index.js
@@ -3,7 +3,6 @@ import TermView from './components/TermView';
 import { glossarytermsReducer, glossarytooltiptermsReducer } from './reducers';
 import { TextWithGlossaryTooltips } from './utils';
 import { FetchTooltipTerms } from './components/Tooltips';
-import DescriptionBlockView from './components/DescriptionBlockView';
 import TooltipPopup from './components/TooltipPopup';
 
 const applyConfig = (config) => {