diff --git a/src/types/stan.ts b/src/types/stan.ts
index 3b089752..eabe5c45 100644
--- a/src/types/stan.ts
+++ b/src/types/stan.ts
@@ -1,16 +1,18 @@
 import {
-  LabwareFieldsFragment, LabwareFlaggedFieldsFragment,
+  LabwareFieldsFragment,
+  LabwareFlaggedFieldsFragment,
   LabwareState,
   Maybe,
   PrinterFieldsFragment,
   Size,
-  WorkStatus,
-} from "./sdk";
-import { Location } from "history";
-import { ClientError } from "graphql-request";
-import { regexSort } from "../lib/helpers";
-import {FunctionComponent} from "react";
+  WorkStatus
+} from './sdk';
+import { Location } from 'history';
+import { ClientError } from 'graphql-request';
+import { regexSort } from '../lib/helpers';
+import { FunctionComponent } from 'react';
 import { GraphQLError } from 'graphql/error';
+
 /**
  * Union of STAN's {@link OperationType} names
  */
@@ -318,7 +320,7 @@ export function createSessionStorageForLabwareAwaiting( labware:LabwareFieldsFra
       labware
           .map(
               (lw: LabwareFieldsFragment) => {
-                const sample = lw.slots.length && lw.slots[0].samples.length ? lw.slots[0].samples[0]:undefined;
+                const sample =  lw.slots.find(slot => slot.samples.length > 0)?.samples.find(sample => sample.tissue !== undefined);
                 return `${lw.barcode},${lw.labwareType.name},${sample?sample.tissue.externalName:""},${sample?sample.tissue.donor.donorName:""},${sample?sample.tissue.spatialLocation.tissueType.name:""},${sample?sample.tissue.spatialLocation.code:""},${sample?sample.tissue.replicate:""}`
               }
               )