diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb
index 0fa9318b..e795a948 100644
--- a/app/controllers/api/base_controller.rb
+++ b/app/controllers/api/base_controller.rb
@@ -91,8 +91,6 @@ class Api::BaseController < ApplicationController
       render json: { error: 'Your account has been flagged as spam. Please contact support@gab.com if you believe this is an error.' }, status: 403
     elsif !current_user.approved?
       render json: { error: 'Your login is currently pending approval' }, status: 403
-    else
-      set_user_activity
     end
   end
 
diff --git a/app/controllers/api/v1/timelines/home_controller.rb b/app/controllers/api/v1/timelines/home_controller.rb
index 2906ced1..79509127 100644
--- a/app/controllers/api/v1/timelines/home_controller.rb
+++ b/app/controllers/api/v1/timelines/home_controller.rb
@@ -1,9 +1,13 @@
 # frozen_string_literal: true
 
 class Api::V1::Timelines::HomeController < Api::BaseController
+
   before_action :require_user!, only: [:show]
   after_action :insert_pagination_headers, unless: -> { @statuses.empty? }
 
+  include UserTrackingConcern
+  include SessionTrackingConcern
+
   def show
     @statuses = load_statuses
     render json: @statuses,
@@ -33,6 +37,8 @@ class Api::V1::Timelines::HomeController < Api::BaseController
   end
 
   def account_home_feed
+    set_user_activity
+    set_session_activity
     HomeFeed.new(current_account)
   end
 
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index b4c906ab..44f73bd9 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -6,8 +6,6 @@ class ApplicationController < ActionController::Base
   protect_from_forgery with: :exception
 
   include Localized
-  include UserTrackingConcern
-  include SessionTrackingConcern
 
   helper_method :current_account
   helper_method :current_session