diff --git a/changelog.d/avatar_upload.fix b/changelog.d/avatar_upload.fix
new file mode 100644
index 000000000..b5dd9ee56
--- /dev/null
+++ b/changelog.d/avatar_upload.fix
@@ -0,0 +1 @@
+fix image cropper error preventing avatar upload
diff --git a/src/components/image_cropper/image_cropper.js b/src/components/image_cropper/image_cropper.js
index b85ef6626..599c95caf 100644
--- a/src/components/image_cropper/image_cropper.js
+++ b/src/components/image_cropper/image_cropper.js
@@ -70,6 +70,9 @@ const ImageCropper = {
       )
     },
     onCropperSelectionChange(event) {
+      if (!this.$refs.cropperCanvas) {
+        return // Cropper sends even before component is fully initialized
+      }
       const cropperCanvas = this.$refs.cropperCanvas
       const cropperCanvasRect = cropperCanvas.getBoundingClientRect()
       const selection = event.detail