diff --git a/app/javascript/flavours/glitch/features/emoji_picker/index.js b/app/javascript/flavours/glitch/features/emoji_picker/index.js
index 036a515f6c..8d06ea2194 100644
--- a/app/javascript/flavours/glitch/features/emoji_picker/index.js
+++ b/app/javascript/flavours/glitch/features/emoji_picker/index.js
@@ -472,9 +472,8 @@ class EmojiPickerDropdown extends React.PureComponent {
           {button || <img
             className={classNames('emojione', { 'pulse-loading': active && loading })}
             alt='blobCat emoji'
-            src='https://cdn.catcatnya.com/custom_emojis/images/000/002/356/static/blobCat.png'
+            src={`${assetHost}/blobCat.png`}
           />}
-          {/* TODO: Fetch :blobCat: From custom_emojis directly */}
         </div>
 
         <Overlay show={active} placement={placement} target={this.findTarget}>
diff --git a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
index c1419e1785..3d00d139dc 100644
--- a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
+++ b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
@@ -390,9 +390,8 @@ class EmojiPickerDropdown extends React.PureComponent {
           {button || <img
             className={classNames('emojione', { 'pulse-loading': active && loading })}
             alt='blobCat emoji'
-            src='https://cdn.catcatnya.com/custom_emojis/images/000/002/356/static/blobCat.png'
+            src={`${assetHost}/blobCat.png`}
           />}
-          {/* TODO: Fetch :blobCat: From custom_emojis directly */}
         </div>
 
         <Overlay show={active} placement={placement} target={this.findTarget}>
diff --git a/public/blobCat.png b/public/blobCat.png
new file mode 100644
index 0000000000..08e1b40807
Binary files /dev/null and b/public/blobCat.png differ