diff --git a/Changelog.md b/Changelog.md
index 4e72b2e71..a47b02c8f 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -92,6 +92,7 @@ diaspora.yml file**. The existing settings from 0.4.x and before will not work a
 * Port contacts page to backbone [#5473](https://github.com/diaspora/diaspora/pull/5473)
 * Replace CSS vendor prefixes automatically [#5532](https://github.com/diaspora/diaspora/pull/5532)
 * Use sentence case consistently throughout UI [#5588](https://github.com/diaspora/diaspora/pull/5588)
+* Hide sign up button when registrations are disabled [#5612](https://github.com/diaspora/diaspora/pull/5612)
 
 ## Bug fixes
 * orca cannot see 'Add Contact' button [#5158](https://github.com/diaspora/diaspora/pull/5158)
diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml
index 3c77464db..1eb722411 100644
--- a/app/views/layouts/_header.html.haml
+++ b/app/views/layouts/_header.html.haml
@@ -8,7 +8,7 @@
       = link_to content_tag(:div, nil, class: 'diaspora_header_logo branding-header-logo'), root_path
 
       %ul#landing_nav
-        - unless current_page?(controller: :registrations, action: :new)
+        - if AppConfig.settings.enable_registrations? && !current_page?(controller: :registrations, action: :new)
           %li= link_to t('devise.shared.links.sign_up'), new_user_registration_path, class: 'login'
         %li= link_to t('devise.shared.links.sign_in'), new_user_session_path, class: 'login'
       #lightbox