diff --git a/lib/pleroma/web/api_spec/operations/remote_interaction_operation.ex b/lib/pleroma/web/api_spec/operations/remote_interaction_operation.ex
index b5bd9d72f..54edbcf32 100644
--- a/lib/pleroma/web/api_spec/operations/remote_interaction_operation.ex
+++ b/lib/pleroma/web/api_spec/operations/remote_interaction_operation.ex
@@ -96,14 +96,4 @@ defmodule Pleroma.Web.ApiSpec.RemoteInteractionOperation do
       responses: %{200 => Operation.response("Web Page", "text/html", %Schema{type: :string})}
     }
   end
-
-  def show_subscribe_form_operation do
-    %Operation{
-      tags: ["Remote interaction"],
-      summary: "Show remote subscribe form",
-      operationId: "RemoteInteractionController.show_subscribe_form",
-      parameters: [],
-      responses: %{200 => Operation.response("Web Page", "text/html", %Schema{type: :string})}
-    }
-  end
 end
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 22e82568a..eea0a0912 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -234,10 +234,11 @@ defmodule Pleroma.Web.Router do
   end
 
   scope "/api/v1/pleroma", Pleroma.Web.PleromaAPI do
+    pipe_through(:pleroma_api)
+
     get("/emoji", UtilController, :emoji)
     get("/captcha", UtilController, :captcha)
     get("/healthcheck", UtilController, :healthcheck)
-
     get("/federation_status", InstancesController, :show)
   end
 
diff --git a/lib/pleroma/web/templates/static_fe/static_fe/profile.html.eex b/lib/pleroma/web/templates/static_fe/static_fe/profile.html.eex
index a14ca305e..85bfd7b3a 100644
--- a/lib/pleroma/web/templates/static_fe/static_fe/profile.html.eex
+++ b/lib/pleroma/web/templates/static_fe/static_fe/profile.html.eex
@@ -2,7 +2,7 @@
   <h1><%= link instance_name(), to: "/" %></h1>
 
   <h3>
-    <form class="pull-right collapse" method="POST" action="<%= Helpers.util_path(@conn, :remote_subscribe) %>">
+    <form class="pull-right collapse" method="POST" action="<%= Helpers.remote_interaction_path(@conn, :remote_subscribe) %>">
       <input type="hidden" name="nickname" value="<%= @user.nickname %>">
       <input type="hidden" name="profile" value="">
       <button type="submit" class="collapse"><%= Gettext.dpgettext("static_pages", "static fe profile page remote follow button", "Remote follow") %></button>
diff --git a/test/pleroma/web/remote_interaction/remote_interaction_controller_test.exs b/test/pleroma/web/remote_interaction/remote_interaction_controller_test.exs
index 116609013..9df86c0a2 100644
--- a/test/pleroma/web/remote_interaction/remote_interaction_controller_test.exs
+++ b/test/pleroma/web/remote_interaction/remote_interaction_controller_test.exs
@@ -428,7 +428,7 @@ defmodule Pleroma.Web.RemoteInteraction.RemoteInteractionControllerTest do
           avatar: %{"url" => [%{"href" => "https://remote.org/avatar.png"}]}
         })
 
-      avatar_url = Pleroma.Web.PleromaAPI.RemoteFollowView.avatar_url(user)
+      avatar_url = Pleroma.Web.RemoteInteraction.RemoteInteractionView.avatar_url(user)
 
       assert avatar_url == "https://remote.org/avatar.png"
     end
@@ -445,7 +445,7 @@ defmodule Pleroma.Web.RemoteInteraction.RemoteInteractionControllerTest do
           avatar: %{"url" => [%{"href" => "https://remote.org/avatar.png"}]}
         })
 
-      avatar_url = Pleroma.Web.PleromaAPI.RemoteFollowView.avatar_url(user)
+      avatar_url = Pleroma.Web.RemoteInteraction.RemoteInteractionView.avatar_url(user)
       url = Pleroma.Web.Endpoint.url()
 
       assert String.starts_with?(avatar_url, url)
@@ -460,7 +460,7 @@ defmodule Pleroma.Web.RemoteInteraction.RemoteInteractionControllerTest do
           avatar: %{"url" => [%{"href" => "#{Pleroma.Web.Endpoint.url()}/localuser/avatar.png"}]}
         })
 
-      avatar_url = Pleroma.Web.PleromaAPI.RemoteFollowView.avatar_url(user)
+      avatar_url = Pleroma.Web.RemoteInteraction.RemoteInteractionView.avatar_url(user)
 
       assert avatar_url == "#{Pleroma.Web.Endpoint.url()}/localuser/avatar.png"
     end