diff --git a/src/screens/caseDetails/feedback/FeedbackDetailItem.tsx b/src/screens/caseDetails/feedback/FeedbackDetailItem.tsx
index f82b675e..61f0d127 100644
--- a/src/screens/caseDetails/feedback/FeedbackDetailItem.tsx
+++ b/src/screens/caseDetails/feedback/FeedbackDetailItem.tsx
@@ -74,8 +74,10 @@ const FeedbackDetailItem = ({
   caseId,
   hideAddress,
 }: IFeedbackDetailItem) => {
-  const caseDetails = useAppSelector((state) => state.allCases.caseDetails[caseId]);
-  const { agentId } = useAppSelector((state) => ({ agentId: state.user.user?.referenceId!! }));
+  const { agentId, caseDetails } = useAppSelector((state) => ({
+    agentId: state.user.user?.referenceId || null,
+    caseDetails: state.allCases.caseDetails?.[caseId] || null,
+  }));
   const [isWhastappSendLoading, setIsWhatsappSendLoading] = useState(false);
   const isGeolocation = feedbackItem?.source?.sourceType === VisitType.GEOLOCATION;
 
diff --git a/src/screens/caseDetails/feedback/FeedbackListItem.tsx b/src/screens/caseDetails/feedback/FeedbackListItem.tsx
index 02ebb93c..73da211b 100644
--- a/src/screens/caseDetails/feedback/FeedbackListItem.tsx
+++ b/src/screens/caseDetails/feedback/FeedbackListItem.tsx
@@ -34,12 +34,11 @@ import { shareToWhatsapp } from '../../../services/FeedbackWhatsApp';
 import { IAddress } from '@types/addressGeolocation.types';
 
 interface IFeedbackListItem {
-  feedbackItem: IFeedback;
+  feedbackItem: IFeedback | IUnSyncedFeedbackItem;
   showHorizontalLine?: boolean;
   loanAccountNumber: string;
   caseId: string;
 }
-// removed (feedbackItem: IFeedback | IUnSyncedFeedbackItem;)  | IUnSyncedFeedbackItem
 
 const FeedbackListItem: React.FC<IFeedbackListItem> = ({
   feedbackItem,
@@ -58,8 +57,8 @@ const FeedbackListItem: React.FC<IFeedbackListItem> = ({
   };
   const [isWhastappSendLoading, setIsWhatsappSendLoading] = useState(false);
   const { agentId, caseDetails } = useAppSelector((state) => ({
-    agentId: state.user.user?.referenceId!!,
-    caseDetails: state.allCases.caseDetails[caseId],
+    agentId: state.user.user?.referenceId || null,
+    caseDetails: state.allCases.caseDetails?.[caseId] || null,
   }));
   const throttledSendToWhatsapp = React.useRef(debounce(shareToWhatsapp, 500));