diff --git a/CHANGELOG-nightly.md b/CHANGELOG-nightly.md
index 65e04d92..1716f553 100644
--- a/CHANGELOG-nightly.md
+++ b/CHANGELOG-nightly.md
@@ -1,3 +1,8 @@
+### 3.1.17.1000
+
+-   Fixed an issue where the channel community highlights would appear when the hide option was enabled
+-   Fixed an issue where the chat leaderboard would appear when community highlights were open
+
 ### 3.1.16.2000
 
 -   Updated Firefox extension URL in onboarding
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1749794a..605ae33d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+### 3.1.17
+
+-   Fixed an issue where the channel community highlights would appear when the hide option was enabled
+-   Fixed an issue where the chat leaderboard would appear when community highlights were open
+
 ### 3.1.16
 
 -   Fixed emote menu not showing emotes with same name but different casing
diff --git a/src/site/twitch.tv/modules/hidden-elements/HiddenElementsModule.vue b/src/site/twitch.tv/modules/hidden-elements/HiddenElementsModule.vue
index a9a9eb59..63f24f79 100644
--- a/src/site/twitch.tv/modules/hidden-elements/HiddenElementsModule.vue
+++ b/src/site/twitch.tv/modules/hidden-elements/HiddenElementsModule.vue
@@ -190,7 +190,8 @@ export const config = [
 }
 
 .seventv-hide-leaderboard {
-	section[data-test-selector="chat-room-component-layout"] > div:first-child > div:first-child {
+	/* stylelint-disable-next-line selector-class-pattern */
+	section[data-test-selector="chat-room-component-layout"] > div.chat-room__content > div:first-child {
 		display: none !important;
 	}
 }
@@ -221,7 +222,8 @@ export const config = [
 }
 
 .seventv-hide-community-highlights {
-	div[class^="community-highlight-stack"] {
+	/* stylelint-disable-next-line selector-class-pattern */
+	section[data-test-selector="chat-room-component-layout"] > div.chat-room__content > div:nth-child(3) {
 		display: none !important;
 	}
 }