diff --git a/src/Components/JIP33Table/JIP33Table.tsx b/src/Components/JIP33Table/JIP33Table.tsx
index 78f5bd5d..65f17d9c 100644
--- a/src/Components/JIP33Table/JIP33Table.tsx
+++ b/src/Components/JIP33Table/JIP33Table.tsx
@@ -7,11 +7,8 @@ import useStyles from "@equinor/fusion-react-ag-grid-styles"
 import { Icon } from "@equinor/eds-core-react"
 import { comment, comment_chat } from "@equinor/eds-icons"
 import styled from "styled-components"
-import { Message } from "../../Models/Message"
 import { ColorLegendEnum } from "./JIP33ColorLegendEnums"
 import { ViewContext } from "../../Context/ViewContext"
-import EquipmentListReview from "../../Components/EquipmentListView/EquipmentListReview"
-import { Conversation } from "../../Models/Conversation"
 
 const Wrapper = styled.div`
     height: 100%;
@@ -24,8 +21,6 @@ const TableContainer = styled.div`
 `
 interface Props {
     rowData: object[]
-    reviewComments?: Message[] | undefined
-    conversations?: Conversation[] | undefined
     setReviewSideSheetOpen?: Dispatch<SetStateAction<boolean>> | undefined
     setCurrentProperty?: Dispatch<SetStateAction<string>> | undefined
     setWidth?: (width: number) => void
@@ -34,18 +29,14 @@ interface Props {
 
 function JIP33Table({
     rowData,
-    reviewComments,
-    conversations,
     setReviewSideSheetOpen,
     setCurrentProperty,
     setWidth,
     width,
 }: Props) {
-    const { setActiveSheetTab } = useContext(ViewContext)
-    const styles = useStyles()
-
-    const { activeTagData } = useContext(ViewContext)
+    const { activeTagData, conversations, setActiveSheetTab } = useContext(ViewContext)
     const [reviewOpen, setReviewOpen] = useState<boolean>(false)
+    const styles = useStyles()
 
     const red = "white" // "#e6b8b7"
     const lightBlue = "white" // "#b7dee8"
diff --git a/src/Components/JIP33WithSideMenu.tsx b/src/Components/JIP33WithSideMenu.tsx
index 08706671..b2fc004a 100644
--- a/src/Components/JIP33WithSideMenu.tsx
+++ b/src/Components/JIP33WithSideMenu.tsx
@@ -152,7 +152,6 @@ const JIP33WithSideMenu: React.FC<Props> = ({
                     <StyledTabPanel>
                         <JIP33Table
                             rowData={rowDataList[activeTab]}
-                            reviewComments={reviewComments}
                             setCurrentProperty={setCurrentProperty}
                             setReviewSideSheetOpen={setReviewSideSheetOpen}
                             setWidth={setWidth}
diff --git a/src/Components/SideSheet/Comments/Components/CommentView.tsx b/src/Components/SideSheet/Comments/Components/CommentView.tsx
index 82e5624d..c8726eb6 100644
--- a/src/Components/SideSheet/Comments/Components/CommentView.tsx
+++ b/src/Components/SideSheet/Comments/Components/CommentView.tsx
@@ -82,6 +82,8 @@ const CommentView: React.FC<CommentViewProps> = ({
             const service = await GetConversationService()
             const savedConversation = await service.createConversation(activeTagData?.review?.id ?? "", createCommentDto)
             setActiveConversation(savedConversation)
+            const newConversations = [...conversations, savedConversation]
+            setConversations(newConversations)
         } catch (error) {
             console.error(`Error creating comment: ${error}`)
         }