diff --git a/src/plugins/annotationCreationCompanionWindow.js b/src/plugins/annotationCreationCompanionWindow.js
index 74937e685eaf65623c2ac435acbcb052a8caea85..89775985ee7527aa16a64c32841e39d9662da30f 100644
--- a/src/plugins/annotationCreationCompanionWindow.js
+++ b/src/plugins/annotationCreationCompanionWindow.js
@@ -18,12 +18,13 @@ function mapStateToProps(state, { id: companionWindowId, windowId }) {
   const { annotationid } = getCompanionWindow(state, { companionWindowId, windowId });
   const canvases = getVisibleCanvases(state, { windowId });
 
-  let annotation;
+  let annotation = null;
   canvases.forEach((canvas) => {
     const annotationsOnCanvas = state.annotations[canvas.id];
     Object.values(annotationsOnCanvas || {}).forEach((value, i) => {
       if (value.json && value.json.items) {
-        annotation = value.json.items.find((anno) => anno.id === annotationid);
+        const maybeAnnot = value.json.items.find((anno) => anno.id === annotationid);
+        if (maybeAnnot !== undefined) annotation = maybeAnnot;
       }
     });
   });