diff --git a/package-lock.json b/package-lock.json
index 296ad77..a751ce1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "reachat",
-  "version": "1.0.1",
+  "version": "1.0.5",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "reachat",
-      "version": "1.0.1",
+      "version": "1.0.5",
       "license": "Apache-2.0",
       "dependencies": {
         "@radix-ui/react-slot": "^1.1.0",
diff --git a/src/SessionMessages/SessionMessage/SessionMessage.tsx b/src/SessionMessages/SessionMessage/SessionMessage.tsx
index baa6626..cea1950 100644
--- a/src/SessionMessages/SessionMessage/SessionMessage.tsx
+++ b/src/SessionMessages/SessionMessage/SessionMessage.tsx
@@ -35,6 +35,7 @@ interface SessionMessageProps extends PropsWithChildren {
 
   /**
    * Whether the message is the last one in the list.
+   * This let's the chat know when to show the loading cursor.
    */
   isLast?: boolean;
 }
diff --git a/stories/Companion.stories.tsx b/stories/Companion.stories.tsx
index c229e65..15e8228 100644
--- a/stories/Companion.stories.tsx
+++ b/stories/Companion.stories.tsx
@@ -81,10 +81,11 @@ export const Basic = () => {
           <SessionMessagesHeader />
           <SessionMessages>
             {conversations =>
-              conversations.map(conversation => (
+              conversations.map((conversation, index) => (
                 <SessionMessage
                   key={conversation.id}
                   conversation={conversation}
+                  isLast={index === conversations.length - 1}
                 />
               ))
             }
@@ -130,10 +131,11 @@ export const Empty = () => {
           <SessionMessagesHeader />
           <SessionMessages>
             {conversations =>
-              conversations.map(conversation => (
+              conversations.map((conversation, index) => (
                 <SessionMessage
                   key={conversation.id}
                   conversation={conversation}
+                  isLast={index === conversations.length - 1}
                 />
               ))
             }
diff --git a/stories/Console.stories.tsx b/stories/Console.stories.tsx
index 4c38b11..99e2470 100644
--- a/stories/Console.stories.tsx
+++ b/stories/Console.stories.tsx
@@ -1,4 +1,4 @@
-import { useState, useRef, FC, useContext, Fragment } from 'react';
+import { useState, useRef, FC, useContext } from 'react';
 import { Meta } from '@storybook/react';
 import {
   Chat,
@@ -86,10 +86,11 @@ export const Basic = () => {
           <SessionMessagesHeader />
           <SessionMessages>
             {conversations =>
-              conversations.map(conversation => (
+              conversations.map((conversation, index) => (
                 <SessionMessage
                   key={conversation.id}
                   conversation={conversation}
+                  isLast={index === conversations.length - 1}
                 />
               ))
             }
@@ -139,10 +140,11 @@ export const Embeds = () => {
           <SessionMessagesHeader />
           <SessionMessages>
             {conversations =>
-              conversations.map(conversation => (
+              conversations.map((conversation, index) => (
                 <SessionMessage
                   key={conversation.id}
                   conversation={conversation}
+                  isLast={index === conversations.length - 1}
                 />
               ))
             }
@@ -194,10 +196,11 @@ export const DefaultSession = () => {
           <SessionMessagesHeader />
           <SessionMessages>
             {conversations =>
-              conversations.map(conversation => (
+              conversations.map((conversation, index) => (
                 <SessionMessage
                   key={conversation.id}
                   conversation={conversation}
+                  isLast={index === conversations.length - 1}
                 />
               ))
             }
@@ -305,10 +308,11 @@ export const FileUploads = () => {
           <SessionMessagesHeader />
           <SessionMessages>
             {conversations =>
-              conversations.map(conversation => (
+              conversations.map((conversation, index) => (
                 <SessionMessage
                   key={conversation.id}
                   conversation={conversation}
+                  isLast={index === conversations.length - 1}
                 />
               ))
             }
@@ -360,10 +364,11 @@ export const DefaultInputValue = () => {
           <SessionMessagesHeader />
           <SessionMessages>
             {conversations =>
-              conversations.map(conversation => (
+              conversations.map((conversation, index) => (
                 <SessionMessage
                   key={conversation.id}
                   conversation={conversation}
+                  isLast={index === conversations.length - 1}
                 />
               ))
             }
@@ -410,10 +415,11 @@ export const UndeleteableSessions = () => {
           <SessionMessagesHeader />
           <SessionMessages>
             {conversations =>
-              conversations.map(conversation => (
+              conversations.map((conversation, index) => (
                 <SessionMessage
                   key={conversation.id}
                   conversation={conversation}
+                  isLast={index === conversations.length - 1}
                 />
               ))
             }
@@ -498,10 +504,11 @@ export const SessionGrouping = () => {
           <SessionMessagesHeader />
           <SessionMessages>
             {conversations =>
-              conversations.map(conversation => (
+              conversations.map((conversation, index) => (
                 <SessionMessage
                   key={conversation.id}
                   conversation={conversation}
+                  isLast={index === conversations.length - 1}
                 />
               ))
             }
@@ -568,10 +575,11 @@ export const HundredSessions = () => {
           <SessionMessagesHeader />
           <SessionMessages>
             {conversations =>
-              conversations.map(conversation => (
+              conversations.map((conversation, index) => (
                 <SessionMessage
                   key={conversation.id}
                   conversation={conversation}
+                  isLast={index === conversations.length - 1}
                 />
               ))
             }
@@ -642,10 +650,11 @@ export const HundredConversations = () => {
           <SessionMessagesHeader />
           <SessionMessages>
             {conversations =>
-              conversations.map(conversation => (
+              conversations.map((conversation, index) => (
                 <SessionMessage
                   key={conversation.id}
                   conversation={conversation}
+                  isLast={index === conversations.length - 1}
                 />
               ))
             }
@@ -708,10 +717,11 @@ export const LongSessionNames = () => {
           <SessionMessagesHeader />
           <SessionMessages>
             {conversations =>
-              conversations.map(conversation => (
+              conversations.map((conversation, index) => (
                 <SessionMessage
                   key={conversation.id}
                   conversation={conversation}
+                  isLast={index === conversations.length - 1}
                 />
               ))
             }
@@ -840,10 +850,11 @@ export const MarkdownShowcase = () => {
           <SessionMessagesHeader />
           <SessionMessages>
             {conversations =>
-              conversations.map(conversation => (
+              conversations.map((conversation, index) => (
                 <SessionMessage
                   key={conversation.id}
                   conversation={conversation}
+                  isLast={index === conversations.length - 1}
                 />
               ))
             }
@@ -930,10 +941,11 @@ export const CVEExample = () => {
           <SessionMessagesHeader />
           <SessionMessages>
             {conversations =>
-              conversations.map(conversation => (
+              conversations.map((conversation, index) => (
                 <SessionMessage
                   key={conversation.id}
                   conversation={conversation}
+                  isLast={index === conversations.length - 1}
                 />
               ))
             }
@@ -1044,10 +1056,11 @@ export const ConversationSources = () => {
           <SessionMessagesHeader />
           <SessionMessages>
             {conversations =>
-              conversations.map(conversation => (
+              conversations.map((conversation, index) => (
                 <SessionMessage
                   key={conversation.id}
                   conversation={conversation}
+                  isLast={index === conversations.length - 1}
                 />
               ))
             }
@@ -1330,10 +1343,11 @@ export const ImageFiles = () => {
           <SessionMessagesHeader />
           <SessionMessages>
             {conversations =>
-              conversations.map(conversation => (
+              conversations.map((conversation, index) => (
                 <SessionMessage
                   key={conversation.id}
                   conversation={conversation}
+                  isLast={index === conversations.length - 1}
                 />
               ))
             }
diff --git a/stories/Integration.stories.tsx b/stories/Integration.stories.tsx
index a2bd553..469bda9 100644
--- a/stories/Integration.stories.tsx
+++ b/stories/Integration.stories.tsx
@@ -169,10 +169,11 @@ export const _OpenAI = () => {
             <SessionMessagesHeader />
             <SessionMessages>
               {conversations =>
-                conversations.map(conversation => (
+                conversations.map((conversation, index) => (
                   <SessionMessage
                     key={conversation.id}
                     conversation={conversation}
+                    isLast={index === conversations.length - 1}
                   />
                 ))
               }
@@ -336,10 +337,11 @@ export const VercelAI = () => {
             <SessionMessagesHeader />
             <SessionMessages>
               {conversations =>
-                conversations.map(conversation => (
+                conversations.map((conversation, index) => (
                   <SessionMessage
                     key={conversation.id}
                     conversation={conversation}
+                    isLast={index === conversations.length - 1}
                   />
                 ))
               }