diff --git a/redisinsight/ui/src/pages/pub-sub/components/subscription-panel/SubscriptionPanel.tsx b/redisinsight/ui/src/pages/pub-sub/components/subscription-panel/SubscriptionPanel.tsx
index 7ce8aa500f..387753d57d 100644
--- a/redisinsight/ui/src/pages/pub-sub/components/subscription-panel/SubscriptionPanel.tsx
+++ b/redisinsight/ui/src/pages/pub-sub/components/subscription-panel/SubscriptionPanel.tsx
@@ -20,14 +20,14 @@ import ClickableAppendInfo from './components/clickable-append-info'
 import styles from './styles.module.scss'
 
 const SubscriptionPanel = () => {
-  const { messages, isSubscribed, loading, count } = useSelector(pubSubSelector)
+  const { messages, isSubscribed, subscriptions, loading, count } = useSelector(pubSubSelector)
 
   const dispatch = useDispatch()
   const { theme } = useContext(ThemeContext)
 
   const { instanceId = '' } = useParams<{ instanceId: string }>()
 
-  const [channels, setChannels] = useState(DEFAULT_SEARCH_MATCH)
+  const [channels, setChannels] = useState(subscriptions?.length ? subscriptions.map((sub) => sub.channel).join(' ') : DEFAULT_SEARCH_MATCH)
 
   const toggleSubscribe = () => {
     dispatch(toggleSubscribeTriggerPubSub(channels))
diff --git a/redisinsight/ui/src/pages/pub-sub/components/subscription-panel/components/patternsInfo/PatternsInfo.tsx b/redisinsight/ui/src/pages/pub-sub/components/subscription-panel/components/patternsInfo/PatternsInfo.tsx
index 1e3f1f1112..f5068af61b 100644
--- a/redisinsight/ui/src/pages/pub-sub/components/subscription-panel/components/patternsInfo/PatternsInfo.tsx
+++ b/redisinsight/ui/src/pages/pub-sub/components/subscription-panel/components/patternsInfo/PatternsInfo.tsx
@@ -20,7 +20,7 @@ const PatternsInfo = ({ channels }: PatternsInfoProps) => {
       <EuiToolTip
         anchorClassName={styles.appendIcon}
         position="right"
-        title={<>{channels?.trim().split(' ').map((ch) => <p>{ch}</p>)}</>}
+        title={<>{channels?.trim().split(' ').map((ch) => <p key={`${ch}`}>{ch}</p>)}</>}
       >
         <EuiIcon
           type="iInCircle"