diff --git a/src/components/gridItems/ChatItem/ChatItem.tsx b/src/components/gridItems/ChatItem/ChatItem.tsx
index 4675d19..6417448 100644
--- a/src/components/gridItems/ChatItem/ChatItem.tsx
+++ b/src/components/gridItems/ChatItem/ChatItem.tsx
@@ -1,4 +1,4 @@
-import { useMemo } from 'react';
+import { memo } from 'react';
 import GridItem from '../GridItem/GridItem';
 import ChatItemHeader from './ChatItemHeader/ChatItemHeader';
 
@@ -7,20 +7,21 @@ interface ChatItemProps {
   isDarkThemePreferred?: boolean;
 }
 
-const ChatItem = ({ streamName, isDarkThemePreferred = false }: ChatItemProps) => {
-  const title = `Chat: ${streamName}`;
+const ChatItem = memo(
+  ({ streamName, isDarkThemePreferred = false }: ChatItemProps) => {
+    const title = `Chat: ${streamName}`;
+    const iframeSrc = `https://www.twitch.tv/embed/${streamName}/chat?parent=${window.location.hostname}${isDarkThemePreferred ? '&darkpopout' : ''}`;
 
-  const iframeSrc = useMemo(() => {
-    const darkParam = isDarkThemePreferred ? '&darkpopout' : '';
-    return `https://www.twitch.tv/embed/${streamName}/chat?parent=${window.location.hostname}${darkParam}`;
-  }, [streamName, isDarkThemePreferred]);
-
-  return (
-    <GridItem title={title} iframeSrc={iframeSrc} streamName={streamName}>
-      <ChatItemHeader streamName={streamName} />
-    </GridItem>
-  );
-};
+    return (
+      <GridItem title={title} iframeSrc={iframeSrc} streamName={streamName}>
+        <ChatItemHeader streamName={streamName} />
+      </GridItem>
+    );
+  },
+  (prev, next) =>
+    prev.isDarkThemePreferred === next.isDarkThemePreferred &&
+    prev.streamName.toLowerCase() === next.streamName.toLowerCase()
+);
 
 ChatItem.displayName = 'ChatItem';
 
diff --git a/src/components/gridItems/GridItem/GridItem.tsx b/src/components/gridItems/GridItem/GridItem.tsx
index 454b112..c13ce8e 100644
--- a/src/components/gridItems/GridItem/GridItem.tsx
+++ b/src/components/gridItems/GridItem/GridItem.tsx
@@ -32,6 +32,7 @@ const GridItem = memo(
           </GridItemHeader>
           <iframe
             ref={iframeRef}
+            key={iframeSrc}
             title={title}
             src={iframeSrc}
             height="100%"
diff --git a/src/components/gridItems/StreamItem/StreamItem.tsx b/src/components/gridItems/StreamItem/StreamItem.tsx
index cc105b0..5e8627f 100644
--- a/src/components/gridItems/StreamItem/StreamItem.tsx
+++ b/src/components/gridItems/StreamItem/StreamItem.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useRef } from 'react';
+import { memo, useCallback, useRef } from 'react';
 import GridItem, { type GridItemRef } from '../GridItem/GridItem';
 import StreamItemHeader from './StreamItemHeader/StreamItemHeader';
 
@@ -6,23 +6,26 @@ interface StreamItemProps {
   streamName: string;
 }
 
-const StreamItem = ({ streamName }: StreamItemProps) => {
-  const gridItemRef = useRef<GridItemRef>(null);
+const StreamItem = memo(
+  ({ streamName }: StreamItemProps) => {
+    const gridItemRef = useRef<GridItemRef>(null);
 
-  const title = `Stream: ${streamName}`;
+    const title = `Stream: ${streamName}`;
 
-  const iframeSrc = `https://player.twitch.tv/?channel=${streamName}&parent=${window.location.hostname}`;
+    const iframeSrc = `https://player.twitch.tv/?channel=${streamName}&parent=${window.location.hostname}`;
 
-  const handleRefresh = useCallback(() => {
-    gridItemRef.current?.refreshIframe();
-  }, []);
+    const handleRefresh = useCallback(() => {
+      gridItemRef.current?.refreshIframe();
+    }, []);
 
-  return (
-    <GridItem ref={gridItemRef} title={title} iframeSrc={iframeSrc} allowFullScreen streamName={streamName}>
-      <StreamItemHeader streamName={streamName} handleRefresh={handleRefresh} />
-    </GridItem>
-  );
-};
+    return (
+      <GridItem ref={gridItemRef} title={title} iframeSrc={iframeSrc} allowFullScreen streamName={streamName}>
+        <StreamItemHeader streamName={streamName} handleRefresh={handleRefresh} />
+      </GridItem>
+    );
+  },
+  (prev, next) => prev.streamName.toLowerCase() === next.streamName.toLowerCase()
+);
 
 StreamItem.displayName = 'StreamItem';