diff --git a/client/components/Channel.vue b/client/components/Channel.vue
index 7c6a7273..b3df786b 100644
--- a/client/components/Channel.vue
+++ b/client/components/Channel.vue
@@ -10,6 +10,7 @@
 			class="badge">{{ channel.unread | roundBadgeNumber }}</span>
 		<template v-if="channel.type === 'channel'">
 			<span
+				v-if="channel.state === 0"
 				class="parted-channel-tooltip tooltipped tooltipped-w"
 				aria-label="Not currently joined">
 				<span class="parted-channel-icon" />
diff --git a/client/css/style.css b/client/css/style.css
index cef07a49..22daedb3 100644
--- a/client/css/style.css
+++ b/client/css/style.css
@@ -661,15 +661,12 @@ background on hover (unless active) */
 }
 
 #sidebar .not-connected-tooltip,
-#sidebar .not-secure-tooltip,
-#sidebar .parted-channel-tooltip {
+#sidebar .not-secure-tooltip {
 	display: none;
-	margin: 0 8px;
 }
 
 #sidebar .not-connected .not-connected-tooltip,
-#sidebar .not-secure .not-secure-tooltip,
-#sidebar .parted-channel .parted-channel-tooltip {
+#sidebar .not-secure .not-secure-tooltip {
 	display: inline-block;
 }
 
@@ -678,6 +675,12 @@ background on hover (unless active) */
 	display: none;
 }
 
+#sidebar .not-connected-tooltip,
+#sidebar .not-secure-tooltip,
+#sidebar .parted-channel-tooltip {
+	margin: 0 8px;
+}
+
 #sidebar .not-secure .chan.lobby {
 	color: #f39c12;
 }