diff --git a/packages/emoji-mart/src/components/Emoji/Emoji.js b/packages/emoji-mart/src/components/Emoji/Emoji.js
index 99e1fd8..57b32bc 100644
--- a/packages/emoji-mart/src/components/Emoji/Emoji.js
+++ b/packages/emoji-mart/src/components/Emoji/Emoji.js
@@ -34,9 +34,10 @@ export default function Emoji(props) {
       </span>
     )
   }
-
-  // TODO: Before enabling `emoji_15_upgrade`, we will need to update this to respect the new
-  // URL format for emoji images in Figma Design and Figjam (which will likely be using Noto).
+  // As of writing, we only use this function with the 'native' emoji set, so all
+  // code below is effectively deprecated. If using this code path again,
+  // Images.getUrl will have to be updated to return the currently in use URLs
+  // used in the Figma product.
 
   const src = Images.getUrl(emojiSkin)
   return (
diff --git a/packages/emoji-mart/src/helpers/images.js b/packages/emoji-mart/src/helpers/images.js
index 4d87b4e..7f4f4b6 100644
--- a/packages/emoji-mart/src/helpers/images.js
+++ b/packages/emoji-mart/src/helpers/images.js
@@ -1,3 +1,6 @@
+// At writing, this URL is not in use. If it is used again,
+// it will need to be updated appropriately to the most
+// recent figma-hosted emoji URL base.
 const URL = 'https://static.figma.com/emoji/4/64/'
 
 function getUrl(emojiSkin) {