diff --git a/src/infrastructure/markup/rule/PhabricatorRemarkupRuleEmbedFile.php b/src/infrastructure/markup/rule/PhabricatorRemarkupRuleEmbedFile.php
index 2317fb5a72..4aa8938618 100644
--- a/src/infrastructure/markup/rule/PhabricatorRemarkupRuleEmbedFile.php
+++ b/src/infrastructure/markup/rule/PhabricatorRemarkupRuleEmbedFile.php
@@ -56,11 +56,11 @@ final class PhabricatorRemarkupRuleEmbedFile
         $attrs['src'] = $file->getBestURI();
         $options['image_class'] = null;
         $file_data = $file->getMetadata();
-        $height = $file_data[PhabricatorFile::METADATA_IMAGE_HEIGHT];
+        $height = idx($file_data, PhabricatorFile::METADATA_IMAGE_HEIGHT);
         if ($height) {
           $attrs['height'] = $height;
         }
-        $width = $file_data[PhabricatorFile::METADATA_IMAGE_WIDTH];
+        $width = idx($file_data, PhabricatorFile::METADATA_IMAGE_WIDTH);
         if ($width) {
           $attrs['width'] = $width;
         }
diff --git a/src/infrastructure/markup/rule/PhabricatorRemarkupRuleImageMacro.php b/src/infrastructure/markup/rule/PhabricatorRemarkupRuleImageMacro.php
index 66c9b66192..c9c30b86ac 100644
--- a/src/infrastructure/markup/rule/PhabricatorRemarkupRuleImageMacro.php
+++ b/src/infrastructure/markup/rule/PhabricatorRemarkupRuleImageMacro.php
@@ -34,8 +34,8 @@ final class PhabricatorRemarkupRuleImageMacro
       if ($file) {
         $src_uri = $file->getBestURI();
         $file_data = $file->getMetadata();
-        $height = $file_data[PhabricatorFile::METADATA_IMAGE_HEIGHT];
-        $width = $file_data[PhabricatorFile::METADATA_IMAGE_WIDTH];
+        $height = idx($file_data,PhabricatorFile::METADATA_IMAGE_HEIGHT);
+        $width = idx($file_data, PhabricatorFile::METADATA_IMAGE_WIDTH);
         if ($height && $width) {
           $style = sprintf(
             'height: %dpx; width: %dpx;',