diff --git a/src/components/TaskPreviewCell.js b/src/components/TaskPreviewCell.js
index ce968d2..bffe9dd 100644
--- a/src/components/TaskPreviewCell.js
+++ b/src/components/TaskPreviewCell.js
@@ -14,12 +14,16 @@ function TaskPreviewCell({
 
   return (
     <>
+      {itemData && (
       <p>
         {formatter(itemData, jsonExt, formatterIndex) ?? HYPHEN}
       </p>
+      )}
+      {incomingData && (
       <p style={{ fontWeight: 'bold' }}>
         {showHistorical(incomingData)}
       </p>
+      )}
     </>
   );
 }
diff --git a/src/components/TaskPreviewTable.js b/src/components/TaskPreviewTable.js
index c779f55..cf57fd5 100644
--- a/src/components/TaskPreviewTable.js
+++ b/src/components/TaskPreviewTable.js
@@ -83,7 +83,7 @@ function TaskPreviewTable({
                   formatterIndex={formatterIndex}
                   jsonExt={!previewItem?.jsonExt || JSON.parse(previewItem.jsonExt)}
                   itemData={previewItem.businessData?.current_data}
-                  incomingData={previewItem.businessData?.incoming_data}
+                  incomingData={previewItem.businessData?.incoming_data || previewItem.businessData}
                 />
               </TableCell>
             ))}