diff --git a/app/controllers/public_controller.rb b/app/controllers/public_controller.rb
index 753542b4..9ea76e76 100644
--- a/app/controllers/public_controller.rb
+++ b/app/controllers/public_controller.rb
@@ -2,7 +2,7 @@ class PublicController < ApplicationController
   before_filter :authenticate_user!
 
   def index
-    @timeline = Answer.all.reverse_order.paginate(page: params[:page])
+    @timeline = Answer.joins(:user).where(users: { privacy_allow_public_timeline: true }).all.reverse_order.paginate(page: params[:page])
     respond_to do |format|
       format.html
       format.js