diff --git a/Changelog.md b/Changelog.md
index 4df078bcb..e2de990ff 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -150,6 +150,7 @@ diaspora.yml file**. The existing settings from 0.4.x and before will not work a
 * Do not truncate notification emails anymore [#4342](https://github.com/diaspora/diaspora/issues/4342)
 * Allows users to export their data in gzipped JSON format from their user settings page [#5499](https://github.com/diaspora/diaspora/pull/5499)
 * Strip EXIF data from newly uploaded images [#5510](https://github.com/diaspora/diaspora/pull/5510)
+* Hide user setting if the community spotlight is not enabled on the pod [#5562](https://github.com/diaspora/diaspora/pull/5562)
 
 # 0.4.1.2
 
diff --git a/app/views/aspects/_no_contacts_message.haml b/app/views/aspects/_no_contacts_message.haml
index 30aa0d3bd..a3977ddc1 100644
--- a/app/views/aspects/_no_contacts_message.haml
+++ b/app/views/aspects/_no_contacts_message.haml
@@ -7,5 +7,6 @@
   %br
   %br
   = t('.try_adding_some_more_contacts')
-  != t('.or_spotlight', :link => link_to(t(".community_spotlight") , community_spotlight_path))
+  - if AppConfig.settings.community_spotlight.enable?
+    != t('.or_spotlight', :link => link_to(t(".community_spotlight") , community_spotlight_path))
 
diff --git a/app/views/users/edit.html.haml b/app/views/users/edit.html.haml
index 38645adcf..39b992f82 100644
--- a/app/views/users/edit.html.haml
+++ b/app/views/users/edit.html.haml
@@ -85,9 +85,10 @@
 
             = f.fields_for :stream_preferences do |type|
               #stream_prefs
-                = f.label :show_community_spotlight_in_stream, :class => "checkbox" do
-                  = f.check_box :show_community_spotlight_in_stream
-                  = t('.show_community_spotlight')
+                - if AppConfig.settings.community_spotlight.enable?
+                  = f.label :show_community_spotlight_in_stream, :class => "checkbox" do
+                    = f.check_box :show_community_spotlight_in_stream
+                    = t('.show_community_spotlight')
 
               .small-horizontal-spacer
                 = f.label :getting_started, :class => "checkbox" do
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
index 82a3561a8..daf46e1e1 100644
--- a/spec/controllers/users_controller_spec.rb
+++ b/spec/controllers/users_controller_spec.rb
@@ -215,6 +215,18 @@ describe UsersController, :type => :controller do
       expect(response.status).to eq(200)
     end
 
+    it 'displays community spotlight checkbox' do
+      AppConfig.settings.community_spotlight.enable = true
+      get 'edit', :id => @user.id
+      expect(response.body).to include('input name="user[show_community_spotlight_in_stream]"')
+    end
+
+    it 'hides community spotlight checkbox' do
+      AppConfig.settings.community_spotlight = false
+      get 'edit', :id => @user.id
+      expect(response.body).not_to include('input name="user[show_community_spotlight_in_stream]"')
+    end
+
     it 'set @email_pref to false when there is a user pref' do
       @user.user_preferences.create(:email_type => 'mentioned')
       get 'edit', :id => @user.id