diff --git a/.eslintrc.json b/.eslintrc.json
index c5695beccb..00faace8cf 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -87,7 +87,7 @@
             }
         ],
         "radix": "error",
-        "spaced-comment": "off",
+        "spaced-comment": ["error", "always", {"markers": ["/"]}],
         "strict": "error",
         "unicorn/consistent-function-scoping": "off",
         "unicorn/explicit-length-check": "off",
diff --git a/frontend_tests/node_tests/recent_topics.js b/frontend_tests/node_tests/recent_topics.js
index 8264ed4ff2..005957a868 100644
--- a/frontend_tests/node_tests/recent_topics.js
+++ b/frontend_tests/node_tests/recent_topics.js
@@ -741,7 +741,7 @@ test("test_topic_edit", () => {
         "4:topic-10,1:topic-7,1:topic-6,1:topic-5,1:topic-4,1:topic-3,1:topic-2,1:topic-1",
     );
 
-    ////////////////// test change topic //////////////////
+    // ---------------- test change topic ----------------
     verify_topic_data(all_topics, stream1, topic6, messages[8].id, true);
     assert.equal(all_topics.get(get_topic_key(stream1, topic8)), undefined);
 
@@ -754,7 +754,7 @@ test("test_topic_edit", () => {
     verify_topic_data(all_topics, stream1, topic8, messages[8].id, true);
     assert.equal(all_topics.get(get_topic_key(stream1, topic6)), undefined);
 
-    ////////////////// test stream change //////////////////
+    // ---------------- test stream change ----------------
     verify_topic_data(all_topics, stream1, topic1, messages[0].id, true);
     assert.equal(all_topics.get(get_topic_key(stream2, topic1)), undefined);
 
@@ -765,7 +765,7 @@ test("test_topic_edit", () => {
     assert.equal(all_topics.get(get_topic_key(stream1, topic1)), undefined);
     verify_topic_data(all_topics, stream2, topic1, messages[0].id, true);
 
-    ////////////////// test stream & topic change //////////////////
+    // ---------------- test stream & topic change ----------------
     verify_topic_data(all_topics, stream2, topic1, messages[0].id, true);
     assert.equal(all_topics.get(get_topic_key(stream3, topic9)), undefined);
 
diff --git a/frontend_tests/node_tests/stream_list.js b/frontend_tests/node_tests/stream_list.js
index fecef03aa1..26ca171ac8 100644
--- a/frontend_tests/node_tests/stream_list.js
+++ b/frontend_tests/node_tests/stream_list.js
@@ -128,9 +128,9 @@ test_ui("create_sidebar_row", (override) => {
     assert(topic_list_cleared);
 
     const expected_elems = [
-        devel_sidebar, //pinned
-        split, //separator
-        social_sidebar, //not pinned
+        devel_sidebar, // pinned
+        split, // separator
+        social_sidebar, // not pinned
     ];
 
     assert.deepEqual(appended_elems, expected_elems);
diff --git a/static/js/composebox_typeahead.js b/static/js/composebox_typeahead.js
index 04b384b75b..9ab33f91fb 100644
--- a/static/js/composebox_typeahead.js
+++ b/static/js/composebox_typeahead.js
@@ -26,9 +26,9 @@ import * as typeahead_helper from "./typeahead_helper";
 import * as user_groups from "./user_groups";
 import * as user_pill from "./user_pill";
 
-//************************************
+// **********************************
 // AN IMPORTANT NOTE ABOUT TYPEAHEADS
-//************************************
+// **********************************
 // They do not do any HTML escaping, at all.
 // And your input to them is rendered as though it were HTML by
 // the default highlighter.
diff --git a/static/js/drafts.js b/static/js/drafts.js
index e5c5ed44a3..e5c59f7e05 100644
--- a/static/js/drafts.js
+++ b/static/js/drafts.js
@@ -463,7 +463,7 @@ function drafts_scroll(next_focus_draft_row) {
     const total_dist = dist_from_top + next_focus_draft_row[0].clientHeight;
     const dist_from_bottom = $(".drafts-container")[0].clientHeight - total_dist;
     if (dist_from_bottom < -4) {
-        //-4 is the min dist from the bottom that will require extra scrolling.
+        // -4 is the min dist from the bottom that will require extra scrolling.
         $(".drafts-list")[0].scrollTop += $(".drafts-list")[0].clientHeight / 2;
     }
 }
diff --git a/static/js/hotkey.js b/static/js/hotkey.js
index 374c316313..4cd83b75da 100644
--- a/static/js/hotkey.js
+++ b/static/js/hotkey.js
@@ -126,8 +126,8 @@ const keypress_mappings = {
     77: {name: "toggle_topic_mute", message_view_only: true}, // 'M'
     80: {name: "narrow_private", message_view_only: true}, // 'P'
     82: {name: "respond_to_author", message_view_only: true}, // 'R'
-    83: {name: "narrow_by_topic", message_view_only: true}, //'S'
-    86: {name: "view_selected_stream", message_view_only: false}, //'V'
+    83: {name: "narrow_by_topic", message_view_only: true}, // 'S'
+    86: {name: "view_selected_stream", message_view_only: false}, // 'V'
     97: {name: "all_messages", message_view_only: true}, // 'a'
     99: {name: "compose", message_view_only: true}, // 'c'
     100: {name: "open_drafts", message_view_only: true}, // 'd'
diff --git a/static/js/settings_config.js b/static/js/settings_config.js
index aef371fdd7..891d80564a 100644
--- a/static/js/settings_config.js
+++ b/static/js/settings_config.js
@@ -88,7 +88,7 @@ export const email_address_visibility_values = {
         code: 1,
         description: i18n.t("Admins, members, and guests"),
     },
-    //// Backend support for this configuration is not available yet.
+    // // Backend support for this configuration is not available yet.
     // admins_and_members: {
     //     code: 2,
     //     description: i18n.t("Members and admins"),