diff --git a/app/helpers/avatars_helper.rb b/app/helpers/avatars_helper.rb
index 7c064a650..8ae4346ac 100644
--- a/app/helpers/avatars_helper.rb
+++ b/app/helpers/avatars_helper.rb
@@ -42,6 +42,6 @@ module AvatarsHelper
   end
 
   def avatar_image_tag(user, **options)
-    image_tag user_avatar_url(user, script_name: user.account.slug), aria: { hidden: "true" }, size: 48, title: user.name, **options
+    image_tag user_avatar_path(user, script_name: user.account.slug), aria: { hidden: "true" }, size: 48, title: user.name, **options
   end
 end
diff --git a/config/initializers/active_storage.rb b/config/initializers/active_storage.rb
index 3edd75cc8..586c292a1 100644
--- a/config/initializers/active_storage.rb
+++ b/config/initializers/active_storage.rb
@@ -8,6 +8,17 @@ ActiveSupport.on_load(:active_storage_blob) do
   end
 end
 
+ActiveSupport.on_load(:action_text_content) do
+  # Install our extensions after ActionText::Engine's
+  ActiveSupport.on_load(:active_storage_blob) do
+    # Ensure all <action-text-attachment>s have a "url" attribute that's a relative
+    # path (for portability across host name changes, beta environments, etc).
+    def to_rich_text_attributes(*)
+      super.merge url: Rails.application.routes.url_helpers.polymorphic_url(self, only_path: true)
+    end
+  end
+end
+
 # Don't configure replica connections for ActiveStorage::Record.
 # When ActiveStorage uses `connects_to`, it creates a separate connection pool
 # from ApplicationRecord. This causes after_commit callbacks to fire in