diff --git a/Changelog.md b/Changelog.md
index bdf6e48e3..ee398f2f3 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -135,6 +135,7 @@ Contributions are very welcome, the hard work is done!
 * Check for collapsible posts after images in posts have loaded [#6671](https://github.com/diaspora/diaspora/pull/6671)
 * Add reason for post report to email sent to admins [#6679](https://github.com/diaspora/diaspora/pull/6679)
 * Add links to the single post view of the related post to photos in the photo stream [#6621](https://github.com/diaspora/diaspora/pull/6621)
+* Add a note for people with disabled JavaScript [#6777](https://github.com/diaspora/diaspora/pull/6777)
 
 # 0.5.9.0
 
diff --git a/app/assets/stylesheets/base.scss b/app/assets/stylesheets/base.scss
index 1e7f268d1..c05454901 100644
--- a/app/assets/stylesheets/base.scss
+++ b/app/assets/stylesheets/base.scss
@@ -86,6 +86,21 @@ pre { word-wrap: break-word; }
   &.visible { opacity: .5; }
 }
 
+.noscript {
+  background-color: rgba($black, .9);
+  height: 100%;
+  margin-top: -50px;
+  position: fixed;
+  width: 100%;
+  z-index: 9001;
+
+  h3 {
+    background-color: $white;
+    margin: 100px;
+    padding: 50px;
+  }
+}
+
 // general purpose classes
 
 .small-horizontal-spacer {
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 67066ccd1..0de5871f5 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -49,6 +49,10 @@
   %body{ class:  "page-#{controller_name} action-#{action_name}" }
     = yield :before_content
 
+    %noscript
+      .noscript
+        %h3= t("error_messages.need_javascript")
+
     = content_for?(:content) ? yield(:content) : yield
 
     = yield :after_content
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 45a531106..a30f5333a 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -91,6 +91,7 @@ en:
     helper:
       invalid_fields: "Invalid fields"
       correct_the_following_errors_and_try_again: "Correct the following errors and try again."
+    need_javascript: "This website requires JavaScript to function properly. If you disabled JavaScript, please enable it and refresh this page."
 
   admins:
     admin_bar: