diff --git a/spiffworkflow-frontend/src/a-spiffui-v3/components/DataStoreForm.tsx b/spiffworkflow-frontend/src/a-spiffui-v3/components/DataStoreForm.tsx
index 514425399..76c4d4c55 100644
--- a/spiffworkflow-frontend/src/a-spiffui-v3/components/DataStoreForm.tsx
+++ b/spiffworkflow-frontend/src/a-spiffui-v3/components/DataStoreForm.tsx
@@ -275,7 +275,7 @@ export default function DataStoreForm({
         name="description"
         aria-label="Description"
         placeholder="Description"
-        value={dataStore.description}
+        value={dataStore.description ?? ''}
         onChange={(event: any) =>
           updateDataStore({ description: event.target.value })
         }
diff --git a/spiffworkflow-frontend/src/a-spiffui-v3/components/DataStoreListTable.tsx b/spiffworkflow-frontend/src/a-spiffui-v3/components/DataStoreListTable.tsx
index 78bec981b..a56eb1005 100644
--- a/spiffworkflow-frontend/src/a-spiffui-v3/components/DataStoreListTable.tsx
+++ b/spiffworkflow-frontend/src/a-spiffui-v3/components/DataStoreListTable.tsx
@@ -143,7 +143,7 @@ export default function DataStoreListTable() {
               searchParams.set('datastore_per_page', '10');
               searchParams.set('type', selectedDataStore.type);
               searchParams.set('identifier', selectedDataStore.id);
-              searchParams.set('location', selectedDataStore.location);
+              searchParams.set('location', selectedDataStore.location ?? '');
               setSearchParams(searchParams);
             }
           }}