diff --git a/app/assets/javascripts/discourse/app/controllers/composer.js b/app/assets/javascripts/discourse/app/controllers/composer.js
index f23101835e..e0c09b70b5 100644
--- a/app/assets/javascripts/discourse/app/controllers/composer.js
+++ b/app/assets/javascripts/discourse/app/controllers/composer.js
@@ -770,15 +770,14 @@ export default Controller.extend({
 
     // TODO: This should not happen in model
     const imageSizes = {};
-    document
-      .querySelectorAll("#reply-control .d-editor-preview img:not(.onebox img)")
-      .forEach((e) => {
-        const src = e.src;
+    $("#reply-control .d-editor-preview img").each((i, e) => {
+      const $img = $(e);
+      const src = $img.prop("src");
 
-        if (src && src.length) {
-          imageSizes[src] = { width: e.width, height: e.height };
-        }
-      });
+      if (src && src.length) {
+        imageSizes[src] = { width: $img.width(), height: $img.height() };
+      }
+    });
 
     const promise = composer
       .save({ imageSizes, editReason: this.editReason })