diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index b809e0c61..de552e342 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -5,7 +5,9 @@
 class HomeController < ApplicationController
   def show
     if current_user
-      if(Role.is_beta?(current_user.person) || Role.is_admin?(current_user.person)) && current_user.contacts.receiving.count == 0
+      flag = FeatureFlagger.new(current_user, current_user.person)
+
+      if flag.new_profile? && flag.following_enabled?
         redirect_to person_path(current_user.person.guid)
       else
         redirect_to stream_path
diff --git a/app/models/feature_flagger.rb b/app/models/feature_flagger.rb
index c2c1030e7..cb0cce7bc 100644
--- a/app/models/feature_flagger.rb
+++ b/app/models/feature_flagger.rb
@@ -16,6 +16,10 @@ class FeatureFlagger
     ENV["NEW_HOTNESS"]
   end
 
+  def following_enabled?
+    person_is_beta? && @current_user.contacts.receiving.count == 0
+  end
+
   protected
 
   def developer?