diff --git a/src/lib/react/Grid/index.tsx b/src/lib/react/Grid/index.tsx
index ce287179..03ebfad7 100644
--- a/src/lib/react/Grid/index.tsx
+++ b/src/lib/react/Grid/index.tsx
@@ -1,5 +1,5 @@
 import * as React from "react";
-import { RemoteParticipant, VideoView } from "..";
+import { LocalParticipant, RemoteParticipant, VideoView } from "..";
 import { calculateLayout } from "./helpers/stageLayout";
 import { makeBounds, makeFrame } from "./helpers/layout";
 import { makeVideoCellView } from "./helpers/cellView";
@@ -12,7 +12,7 @@ function GridVideoCellView({
     render,
 }: {
     cell: { clientId: string; bounds: { width: number; height: number }; origin: { top: number; left: number } };
-    participant: RemoteParticipant;
+    participant: RemoteParticipant | LocalParticipant;
     render?: () => React.ReactNode;
 }) {
     return (
@@ -38,19 +38,20 @@ interface GridProps {
         participant,
     }: {
         cell: { clientId: string; bounds: { width: number; height: number }; origin: { top: number; left: number } };
-        participant: RemoteParticipant;
+        participant: RemoteParticipant | LocalParticipant;
     }) => React.ReactNode;
+    videoGridGap?: number;
 }
 
-function Grid({ roomConnection, renderParticipant }: GridProps) {
-    const { remoteParticipants } = roomConnection.state;
+function Grid({ roomConnection, renderParticipant, videoGridGap = 0 }: GridProps) {
+    const { remoteParticipants, localParticipant } = roomConnection.state;
     const gridRef = React.useRef<HTMLDivElement>(null);
     const [videos, setVideos] = React.useState<ReturnType<typeof makeVideoCellView>[]>([]);
     const [stageLayout, setStageLayout] = React.useState<ReturnType<typeof calculateLayout> | null>(null);
 
     React.useEffect(() => {
         setVideos(
-            remoteParticipants.map((participant) =>
+            [localParticipant, ...remoteParticipants].map((participant) =>
                 makeVideoCellView({
                     aspectRatio: 16 / 9,
                     avatarSize: 0,
@@ -59,7 +60,7 @@ function Grid({ roomConnection, renderParticipant }: GridProps) {
                 })
             )
         );
-    }, [remoteParticipants]);
+    }, [remoteParticipants, localParticipant]);
 
     React.useEffect(() => {
         if (!gridRef.current || !videos.length) {
@@ -82,6 +83,7 @@ function Grid({ roomConnection, renderParticipant }: GridProps) {
                                 height: gridRef.current?.clientHeight,
                             }),
                             videos,
+                            videoGridGap,
                         });
                     });
                 },
@@ -104,10 +106,10 @@ function Grid({ roomConnection, renderParticipant }: GridProps) {
                 position: "relative",
             }}
         >
-            {remoteParticipants.map((participant, i) => {
+            {[localParticipant, ...remoteParticipants].map((participant, i) => {
                 const cell = stageLayout?.videoGrid.cells[i];
 
-                if (!cell) return null;
+                if (!cell || !participant) return null;
 
                 return (
                     <GridVideoCellView
diff --git a/src/stories/custom-ui.stories.tsx b/src/stories/custom-ui.stories.tsx
index 145afe44..73d7619e 100644
--- a/src/stories/custom-ui.stories.tsx
+++ b/src/stories/custom-ui.stories.tsx
@@ -179,11 +179,11 @@ export const GridStory = ({ roomUrl }: { roomUrl: string; displayName?: string }
         return <p>Set room url on the Controls panel</p>;
     }
 
-    const roomConnection = useRoomConnection(roomUrl, { localMediaOptions: { audio: false, video: false } });
+    const roomConnection = useRoomConnection(roomUrl, { localMediaOptions: { audio: false, video: true } });
 
     return (
         <div style={{ height: "100vh" }}>
-            <VideoGrid roomConnection={roomConnection} />
+            <VideoGrid roomConnection={roomConnection} videoGridGap={10} />
         </div>
     );
 };
@@ -193,28 +193,39 @@ export const GridWithCustomVideosStory = ({ roomUrl }: { roomUrl: string; displa
         return <p>Set room url on the Controls panel</p>;
     }
 
-    const roomConnection = useRoomConnection(roomUrl, { localMediaOptions: { audio: false, video: false } });
+    const roomConnection = useRoomConnection(roomUrl, { localMediaOptions: { audio: false, video: true } });
 
     return (
         <div style={{ height: "100vh" }}>
             <VideoGrid
                 roomConnection={roomConnection}
+                videoGridGap={10}
                 renderParticipant={({ participant }) => {
-                    if (!participant.stream) return null;
+                    if (!participant.stream) {
+                        return null;
+                    }
 
                     return (
                         <div
-                            style={{ display: "flex", alignItems: "center", justifyContent: "center", height: "100%" }}
+                            style={{
+                                display: "flex",
+                                flexDirection: "column",
+                                alignItems: "center",
+                                justifyContent: "center",
+                                height: "100%",
+                            }}
                         >
                             <VideoView
                                 style={{
+                                    border: "4px dashed red",
+                                    boxSizing: "border-box",
                                     borderRadius: "100%",
                                     objectFit: "cover",
                                     width: "60%",
-                                    border: "10px striped red",
                                 }}
                                 stream={participant.stream}
                             />
+                            <p>{participant.displayName}</p>
                         </div>
                     );
                 }}