diff --git a/canopeum_frontend/src/components/analytics/OptionQuantitySelector.tsx b/canopeum_frontend/src/components/analytics/OptionQuantitySelector.tsx
index bc8acae63..1d08f01eb 100644
--- a/canopeum_frontend/src/components/analytics/OptionQuantitySelector.tsx
+++ b/canopeum_frontend/src/components/analytics/OptionQuantitySelector.tsx
@@ -25,6 +25,9 @@ export type SelectorOptionQuantity<TValue> = {
   quantity?: number,
 }
 
+const MINIMUM_QUANTITY = 1 // Makes it easy to refactor if we support a min input
+const DEFAULT_QUANTITY = 1
+
 const OptionQuantitySelector = <TValue extends OptionQuantityValueType>(
   { id, label, options, selected, withQuantity, onChange }: Props<TValue>,
 ) => {
@@ -43,9 +46,10 @@ const OptionQuantitySelector = <TValue extends OptionQuantityValueType>(
       optionQuantity.option.value === option.value
     )
 
-    existingOptionIndex === -1
-      ? onChange([...selected, { option, quantity: 1 }])
-      : updateQuantity(existingOptionIndex, 1)
+    // Do nothing if already selected
+    if (existingOptionIndex !== -1) return
+
+    onChange([...selected, { option, quantity: DEFAULT_QUANTITY }])
   }
 
   const updateQuantity = (
@@ -55,17 +59,16 @@ const OptionQuantitySelector = <TValue extends OptionQuantityValueType>(
   ) => {
     const updatedOption = { ...selected[optionIndex] }
     updatedOption.quantity = changeType === 'absolute'
-      ? Math.max(quantity, 1)
-      : (updatedOption.quantity ?? 1) + quantity
-
+      ? Math.max(quantity, MINIMUM_QUANTITY)
+      : (updatedOption.quantity ?? MINIMUM_QUANTITY) + quantity
+
+    // NOTE: Currently unusable since we always disable at minimum,
+    // kept in case we wanna restore that behaviour
+    // if (updatedOption.quantity <= 0) {
+    //   removeOption(optionIndex)
+    // } else {
     const updatedSelected = [...selected]
-
-    if (updatedOption.quantity <= 0) {
-      updatedSelected.splice(optionIndex, 1)
-    } else {
-      updatedSelected[optionIndex] = updatedOption
-    }
-
+    updatedSelected[optionIndex] = updatedOption
     onChange(updatedSelected)
   }
 
@@ -85,16 +88,16 @@ const OptionQuantitySelector = <TValue extends OptionQuantityValueType>(
         autoSelect
         clearOnBlur
         freeSolo
-        getOptionKey={option => {
-          if (typeof (option) === 'string') return option
-
-          return option.value
-        }}
-        getOptionLabel={option => {
-          if (typeof (option) === 'string') return option
-
-          return option.displayText
-        }}
+        getOptionKey={option => (
+          typeof (option) === 'string'
+            ? option
+            : option.value
+        )}
+        getOptionLabel={option => (
+          typeof (option) === 'string'
+            ? option
+            : option.displayText
+        )}
         id={id}
         onChange={(_event, option) => {
           if (option === null || typeof (option) === 'string') return
@@ -135,7 +138,7 @@ const OptionQuantitySelector = <TValue extends OptionQuantityValueType>(
       <ul className='list-group list-group-flush overflow-hidden mt-1'>
         {selected.map((optionQuantity, index) => (
           <li
-            className='list-group-item row d-flex align-items-center justify-content-between'
+            className='list-group-item row d-flex justify-content-between align-items-center'
             key={`selected-specie-${optionQuantity.option.value}`}
           >
             <div className='col-6'>{optionQuantity.option.displayText}</div>
@@ -145,6 +148,7 @@ const OptionQuantitySelector = <TValue extends OptionQuantityValueType>(
                 <div className='d-flex justify-content-center align-items-center'>
                   <button
                     className='btn btn-outline-dark btn-sm icon-button p-1'
+                    disabled={optionQuantity.quantity === MINIMUM_QUANTITY}
                     onClick={() => updateQuantity(index, -1)}
                     type='button'
                   >
@@ -162,7 +166,7 @@ const OptionQuantitySelector = <TValue extends OptionQuantityValueType>(
 
                   <button
                     className='btn btn-outline-dark btn-sm icon-button p-1'
-                    onClick={() => updateQuantity(index, 1)}
+                    onClick={() => updateQuantity(index, +1)}
                     type='button'
                   >
                     <span className='material-symbols-outlined fill-icon icon-xs'>add</span>
diff --git a/canopeum_frontend/src/components/analytics/batch-modal/BatchForm.tsx b/canopeum_frontend/src/components/analytics/batch-modal/BatchForm.tsx
index 711b17459..708b5b3bc 100644
--- a/canopeum_frontend/src/components/analytics/batch-modal/BatchForm.tsx
+++ b/canopeum_frontend/src/components/analytics/batch-modal/BatchForm.tsx
@@ -54,245 +54,239 @@ const BatchForm = ({ handleBatchChange, initialBatch }: Props) => {
   }
 
   return (
-    <form>
-      <div className='d-flex flex-column gap-3'>
-        <div>
-          <label className='form-label' htmlFor='batch-name'>
-            {t('analyticsSite.batch-modal.name-label')}
-          </label>
-          <input
-            className='form-control'
-            id='batch-name'
-            onChange={event => setBatch(value => ({ ...value, name: event.target.value }))}
-            type='text'
-            value={batch.name}
-          />
-        </div>
+    <form className='d-flex flex-column gap-3'>
+      <div>
+        <label className='form-label' htmlFor='batch-name'>
+          {t('analyticsSite.batch-modal.name-label')}
+        </label>
+        <input
+          className='form-control'
+          id='batch-name'
+          onChange={event => setBatch(value => ({ ...value, name: event.target.value }))}
+          type='text'
+          value={batch.name}
+        />
+      </div>
 
-        <div>
-          <label className='form-label' htmlFor='sponsor-name'>
-            {t('analyticsSite.batch-modal.sponsor-name-label')}
-          </label>
-          <input
-            className='form-control'
-            id='sponsor-name'
-            onChange={event =>
-              setBatch(value => ({
-                ...value,
-                sponsor: { ...value.sponsor, name: event.target.value },
-              }))}
-            type='text'
-            value={batch.sponsor?.name}
-          />
-        </div>
+      <div>
+        <label className='form-label' htmlFor='sponsor-name'>
+          {t('analyticsSite.batch-modal.sponsor-name-label')}
+        </label>
+        <input
+          className='form-control'
+          id='sponsor-name'
+          onChange={event =>
+            setBatch(value => ({
+              ...value,
+              sponsor: { ...value.sponsor, name: event.target.value },
+            }))}
+          type='text'
+          value={batch.sponsor?.name}
+        />
+      </div>
+
+      <div>
+        <label className='form-label' htmlFor='sponsor-website-url'>
+          {t('analyticsSite.batch-modal.sponsor-website-url-label')}
+        </label>
+        <input
+          className='form-control'
+          id='sponsor-website-url'
+          onChange={event =>
+            setBatch(value => ({
+              ...value,
+              sponsor: { ...value.sponsor, url: event.target.value },
+            }))}
+          type='text'
+          value={batch.sponsor?.url}
+        />
+      </div>
 
-        <div>
-          <label className='form-label' htmlFor='sponsor-website-url'>
-            {t('analyticsSite.batch-modal.sponsor-website-url-label')}
-          </label>
+      <div>
+        <label className='form-label' htmlFor='sponsor-logo'>
+          {t('analyticsSite.batch-modal.sponsor-logo-label')}
+        </label>
+        <ImageUpload
+          id='batch-sponsor-logo-upload'
+          imageUrl={sponsorLogoUrl}
+          onChange={onSponsorLogoUpload}
+        />
+      </div>
+
+      <div>
+        <label className='form-label' htmlFor='size'>
+          {t('analyticsSite.batch-modal.size-label')}
+        </label>
+        <div className='input-group'>
           <input
             className='form-control'
-            id='sponsor-website-url'
+            id='size'
+            min={0}
             onChange={event =>
               setBatch(value => ({
                 ...value,
-                sponsor: { ...value.sponsor, url: event.target.value },
+                size: Number.parseInt(event.target.value, 10),
               }))}
-            type='text'
-            value={batch.sponsor?.url}
-          />
-        </div>
-
-        <div>
-          <label className='form-label' htmlFor='sponsor-logo'>
-            {t('analyticsSite.batch-modal.sponsor-logo-label')}
-          </label>
-          <ImageUpload
-            id='batch-sponsor-logo-upload'
-            imageUrl={sponsorLogoUrl}
-            onChange={onSponsorLogoUpload}
-          />
-        </div>
-
-        <div>
-          <label className='form-label' htmlFor='size'>
-            {t('analyticsSite.batch-modal.size-label')}
-          </label>
-          <div className='input-group'>
-            <input
-              className='form-control'
-              id='size'
-              min={0}
-              onChange={event =>
-                setBatch(value => ({
-                  ...value,
-                  size: Number.parseInt(event.target.value, 10),
-                }))}
-              type='number'
-              value={floorNumberValue(batch.size)}
-            />
-            <span className='input-group-text'>
-              {t('analyticsSite.batch-modal.feet-squared')}
-            </span>
-          </div>
-        </div>
-
-        <div>
-          <TreeSpeciesSelector
-            label='analyticsSite.batch-modal.number-of-trees-label'
-            onChange={useCallback(
-              species =>
-                setBatch(current => ({
-                  ...current,
-                  species,
-                  plantCount: mapSum(species, 'quantity'),
-                })),
-              [],
-            )}
-            species={batch.species}
+            type='number'
+            value={floorNumberValue(batch.size)}
           />
-        </div>
-
-        <div>
-          <label className='form-label' htmlFor='total-number-of-plants'>
-            {t('analyticsSite.batch-modal.total-number-of-plants-label')}:&nbsp;
-          </label>
-          <span id='total-number-of-plants'>
-            {batch.plantCount}
+          <span className='input-group-text'>
+            {t('analyticsSite.batch-modal.feet-squared')}
           </span>
         </div>
+      </div>
 
-        <div>
-          <label className='form-label' htmlFor='soil-condition'>
-            {t('analyticsSite.batch-modal.soil-condition-label')}
-          </label>
-          <input
-            className='form-control'
-            id='soil-condition'
-            onChange={event => setBatch(value => ({ ...value, soilCondition: event.target.value }))}
-            type='text'
-            value={batch.soilCondition}
-          />
-        </div>
-
-        <FertilizersSelector
-          fertilizers={batch.fertilizers}
+      <div>
+        <TreeSpeciesSelector
+          label='analyticsSite.batch-modal.number-of-trees-label'
           onChange={useCallback(
-            fertilizers =>
+            species =>
               setBatch(current => ({
                 ...current,
-                fertilizers,
+                species,
+                plantCount: mapSum(species, 'quantity'),
               })),
             [],
           )}
+          species={batch.species}
         />
+      </div>
 
-        <MulchLayersSelector
-          mulchLayers={batch.mulchLayers}
-          onChange={useCallback(
-            mulchLayers =>
-              setBatch(current => ({
-                ...current,
-                mulchLayers,
-              })),
-            [],
-          )}
+      <div>
+        <label className='form-label'>
+          {t('analyticsSite.batch-modal.total-number-of-plants-label')}:&nbsp;
+        </label>
+        <span>{batch.plantCount}</span>
+      </div>
+
+      <div>
+        <label className='form-label' htmlFor='soil-condition'>
+          {t('analyticsSite.batch-modal.soil-condition-label')}
+        </label>
+        <input
+          className='form-control'
+          id='soil-condition'
+          onChange={event => setBatch(value => ({ ...value, soilCondition: event.target.value }))}
+          type='text'
+          value={batch.soilCondition}
         />
+      </div>
 
-        <SupportSpeciesSelector
+      <FertilizersSelector
+        fertilizers={batch.fertilizers}
+        onChange={useCallback(
+          fertilizers =>
+            setBatch(current => ({
+              ...current,
+              fertilizers,
+            })),
+          [],
+        )}
+      />
+
+      <MulchLayersSelector
+        mulchLayers={batch.mulchLayers}
+        onChange={useCallback(
+          mulchLayers =>
+            setBatch(current => ({
+              ...current,
+              mulchLayers,
+            })),
+          [],
+        )}
+      />
+
+      <SupportSpeciesSelector
+        onChange={useCallback(
+          supportedSpecies =>
+            setBatch(current => ({
+              ...current,
+              supportedSpecies,
+            })),
+          [],
+        )}
+        species={batch.supportedSpecies}
+      />
+
+      <div>
+        <label className='form-label' htmlFor='survived'>
+          {t('analyticsSite.batch-modal.survived-label')}
+        </label>
+        <input
+          className='form-control'
+          id='survived'
+          onChange={event =>
+            setBatch(value => ({
+              ...value,
+              survivedCount: Number.parseInt(event.target.value, 10),
+            }))}
+          type='number'
+          value={floorNumberValue(batch.survivedCount)}
+        />
+      </div>
+
+      <div>
+        <label className='form-label' htmlFor='replaced'>
+          {t('analyticsSite.batch-modal.replaced-label')}
+        </label>
+        <input
+          className='form-control'
+          id='replaced'
+          onChange={event =>
+            setBatch(value => ({
+              ...value,
+              replaceCount: Number.parseInt(event.target.value, 10),
+            }))}
+          type='number'
+          value={floorNumberValue(batch.replaceCount)}
+        />
+      </div>
+
+      <div>
+        <TreeSpeciesSelector
+          label='analyticsSite.batch-modal.seeds-per-species-label'
           onChange={useCallback(
-            supportedSpecies =>
+            species =>
               setBatch(current => ({
                 ...current,
-                supportedSpecies,
+                seeds: species,
+                totalNumberSeeds: mapSum(species, 'quantity'),
               })),
             [],
           )}
-          species={batch.supportedSpecies}
+          species={batch.seeds}
         />
+      </div>
 
-        <div>
-          <label className='form-label' htmlFor='survived'>
-            {t('analyticsSite.batch-modal.survived-label')}
-          </label>
-          <input
-            className='form-control'
-            id='survived'
-            onChange={event =>
-              setBatch(value => ({
-                ...value,
-                survivedCount: Number.parseInt(event.target.value, 10),
-              }))}
-            type='number'
-            value={floorNumberValue(batch.survivedCount)}
-          />
-        </div>
-
-        <div>
-          <label className='form-label' htmlFor='replaced'>
-            {t('analyticsSite.batch-modal.replaced-label')}
-          </label>
-          <input
-            className='form-control'
-            id='replaced'
-            onChange={event =>
-              setBatch(value => ({
-                ...value,
-                replaceCount: Number.parseInt(event.target.value, 10),
-              }))}
-            type='number'
-            value={floorNumberValue(batch.replaceCount)}
-          />
-        </div>
-
-        <div>
-          <TreeSpeciesSelector
-            label='analyticsSite.batch-modal.seeds-per-species-label'
-            onChange={useCallback(
-              species =>
-                setBatch(current => ({
-                  ...current,
-                  seeds: species,
-                  totalNumberSeeds: mapSum(species, 'quantity'),
-                })),
-              [],
-            )}
-            species={batch.seeds}
-          />
-        </div>
-
-        <div>
-          <label className='form-label' htmlFor='total-number-seeds'>
-            {t('analyticsSite.batch-modal.total-seeds-label')}:&nbsp;
-          </label>
-          <span id='total-number-seeds'>
-            {batch.totalNumberSeeds}
-          </span>
-        </div>
+      <div>
+        <label className='form-label'>
+          {t('analyticsSite.batch-modal.total-seeds-label')}:&nbsp;
+        </label>
+        <span>{batch.totalNumberSeeds}</span>
+      </div>
 
-        <div>
-          <label className='form-label' htmlFor='propagation'>
-            {t('analyticsSite.batch-modal.propagation-label')}
-          </label>
-          <input
-            className='form-control'
-            id='propagation'
-            onChange={event =>
-              setBatch(value => ({
-                ...value,
-                totalPropagation: Number.parseInt(event.target.value, 10),
-              }))}
-            type='number'
-            value={floorNumberValue(batch.totalPropagation)}
-          />
-        </div>
+      <div>
+        <label className='form-label' htmlFor='propagation'>
+          {t('analyticsSite.batch-modal.propagation-label')}
+        </label>
+        <input
+          className='form-control'
+          id='propagation'
+          onChange={event =>
+            setBatch(value => ({
+              ...value,
+              totalPropagation: Number.parseInt(event.target.value, 10),
+            }))}
+          type='number'
+          value={floorNumberValue(batch.totalPropagation)}
+        />
+      </div>
 
-        <div className='mb-3'>
-          <label className='form-label' htmlFor='batch-image'>
-            {t('analyticsSite.batch-modal.images-label')}
-          </label>
-          <ImageUpload id='batch-image-upload' imageUrl={batchImageURL} onChange={onImageUpload} />
-        </div>
+      <div>
+        <label className='form-label' htmlFor='batch-image'>
+          {t('analyticsSite.batch-modal.images-label')}
+        </label>
+        <ImageUpload id='batch-image-upload' imageUrl={batchImageURL} onChange={onImageUpload} />
       </div>
     </form>
   )
diff --git a/canopeum_frontend/src/components/analytics/batch-modal/batchModal.model.ts b/canopeum_frontend/src/components/analytics/batch-modal/batchModal.model.ts
index 16f964f32..66b3d4184 100644
--- a/canopeum_frontend/src/components/analytics/batch-modal/batchModal.model.ts
+++ b/canopeum_frontend/src/components/analytics/batch-modal/batchModal.model.ts
@@ -34,10 +34,10 @@ export const DEFAULT_BATCH_FORM_DTO: BatchFormDto = {
     logo: undefined,
   },
   supportedSpecies: [],
-  plantCount: -1,
+  plantCount: 0,
   survivedCount: undefined,
   replaceCount: undefined,
-  totalNumberSeeds: -1,
+  totalNumberSeeds: 0,
   totalPropagation: undefined,
   image: undefined,
   fertilizers: [],
diff --git a/canopeum_frontend/src/components/analytics/site-modal/SiteCoordinates.tsx b/canopeum_frontend/src/components/analytics/site-modal/SiteCoordinates.tsx
index 3048f279c..04e3d7250 100644
--- a/canopeum_frontend/src/components/analytics/site-modal/SiteCoordinates.tsx
+++ b/canopeum_frontend/src/components/analytics/site-modal/SiteCoordinates.tsx
@@ -1,11 +1,11 @@
 import { useTranslation } from 'react-i18next'
 
-import { type Coordinate, defaultLatitude, defaultLongitude } from '@models/Coordinate'
+import { type Coordinate, type DefaultCoordinate, defaultLatitude, defaultLongitude } from '@models/Coordinate'
 
 type Props = {
-  readonly latitude?: Coordinate,
-  readonly longitude?: Coordinate,
-  readonly onChange: (latitude: Coordinate, longitude: Coordinate) => void,
+  readonly latitude?: DefaultCoordinate,
+  readonly longitude?: DefaultCoordinate,
+  readonly onChange: (latitude: DefaultCoordinate, longitude: DefaultCoordinate) => void,
 }
 
 const SiteCoordinates = (
diff --git a/canopeum_frontend/src/components/analytics/site-modal/SiteModal.tsx b/canopeum_frontend/src/components/analytics/site-modal/SiteModal.tsx
index 6188ddbf1..4754289b6 100644
--- a/canopeum_frontend/src/components/analytics/site-modal/SiteModal.tsx
+++ b/canopeum_frontend/src/components/analytics/site-modal/SiteModal.tsx
@@ -7,9 +7,10 @@ import SiteCoordinates from '@components/analytics/site-modal/SiteCoordinates'
 import TreeSpeciesSelector from '@components/analytics/TreeSpeciesSelector'
 import { LanguageContext } from '@components/context/LanguageContext'
 import useApiClient from '@hooks/ApiClientHook'
-import { type Coordinate, defaultLatitude, defaultLongitude, extractCoordinate } from '@models/Coordinate'
+import { type DefaultCoordinate, defaultLatitude, defaultLongitude, extractCoordinate } from '@models/Coordinate'
 import { type SiteType, Species } from '@services/api'
 import { getApiBaseUrl } from '@services/apiSettings'
+import { mapSum } from '@utils/arrayUtils'
 
 type Props = {
   readonly open: boolean,
@@ -24,8 +25,8 @@ export type SiteDto = {
   siteName?: string,
   siteType?: number,
   siteImage?: File,
-  dmsLatitude: Coordinate,
-  dmsLongitude: Coordinate,
+  dmsLatitude: DefaultCoordinate,
+  dmsLongitude: DefaultCoordinate,
   presentation?: string,
   size?: number,
   species: Species[],
@@ -46,7 +47,7 @@ const SiteModal = ({ open, handleClose, siteId }: Props) => {
   const { getApiClient } = useApiClient()
   const { translateValue } = useContext(LanguageContext)
 
-  const [site, setSite] = useState<SiteDto>(defaultSiteDto)
+  const [site, setSite] = useState(defaultSiteDto)
   const [availableSiteTypes, setAvailableSiteTypes] = useState<SiteType[]>([])
   const [siteImageURL, setSiteImageURL] = useState<string>()
 
@@ -114,8 +115,8 @@ const SiteModal = ({ open, handleClose, siteId }: Props) => {
       </DialogTitle>
 
       <DialogContent>
-        <form>
-          <div className='mb-3'>
+        <form className='d-flex flex-column gap-3'>
+          <div>
             <label className='form-label' htmlFor='site-name'>
               {t('analytics.site-modal.site-name')}
             </label>
@@ -128,7 +129,7 @@ const SiteModal = ({ open, handleClose, siteId }: Props) => {
             />
           </div>
 
-          <div className='mb-3'>
+          <div>
             <label className='form-label' htmlFor='site-type'>
               {t('analytics.site-modal.site-type')}
             </label>
@@ -147,27 +148,25 @@ const SiteModal = ({ open, handleClose, siteId }: Props) => {
             </select>
           </div>
 
-          <div className='mb-3'>
+          <div>
             <label className='form-label' htmlFor='site-image'>
               {t('analytics.site-modal.site-type')}
             </label>
             <ImageUpload id='site-image-upload' imageUrl={siteImageURL} onChange={onImageUpload} />
           </div>
 
-          <div className='mb-3'>
-            <SiteCoordinates
-              latitude={site.dmsLatitude}
-              longitude={site.dmsLongitude}
-              onChange={(latitude, longitude) =>
-                setSite(current => ({
-                  ...current,
-                  dmsLatitude: latitude,
-                  dmsLongitude: longitude,
-                }))}
-            />
-          </div>
-
-          <div className='mb-3'>
+          <SiteCoordinates
+            latitude={site.dmsLatitude}
+            longitude={site.dmsLongitude}
+            onChange={(latitude, longitude) =>
+              setSite(current => ({
+                ...current,
+                dmsLatitude: latitude,
+                dmsLongitude: longitude,
+              }))}
+          />
+
+          <div>
             <label className='form-label' htmlFor='site-presentation'>
               {t('analytics.site-modal.site-presentation')}
             </label>
@@ -179,7 +178,7 @@ const SiteModal = ({ open, handleClose, siteId }: Props) => {
             />
           </div>
 
-          <div className='mb-3'>
+          <div>
             <label className='form-label' htmlFor='site-size'>
               {t('analytics.site-modal.site-size')}
             </label>
@@ -196,19 +195,24 @@ const SiteModal = ({ open, handleClose, siteId }: Props) => {
             </div>
           </div>
 
-          <div className='mb-3'>
-            <TreeSpeciesSelector
-              label='analytics.site-modal.site-tree-species'
-              onChange={species =>
-                setSite(current => ({
-                  ...current,
-                  species,
-                }))}
-              species={site.species}
-            />
+          <TreeSpeciesSelector
+            label='analytics.site-modal.site-tree-species'
+            onChange={species =>
+              setSite(current => ({
+                ...current,
+                species,
+              }))}
+            species={site.species}
+          />
+
+          <div>
+            <label className='form-label'>
+              {t('analyticsSite.batch-modal.total-number-of-plants-label')}:&nbsp;
+            </label>
+            <span>{mapSum(site.species, 'quantity')}</span>
           </div>
 
-          <div className='mb-3'>
+          <div>
             <label className='form-label' htmlFor='site-research-partner'>
               {t('analytics.site-modal.site-research-partner')}
             </label>
@@ -248,7 +252,7 @@ const SiteModal = ({ open, handleClose, siteId }: Props) => {
             </div>
           </div>
 
-          <div className='mb-3'>
+          <div>
             <label className='form-label' htmlFor='site-map-visibility'>
               {t('analytics.site-modal.site-map-visibility')}
             </label>
diff --git a/canopeum_frontend/src/models/Coordinate.ts b/canopeum_frontend/src/models/Coordinate.ts
index 1d7e46c05..8c169c19b 100644
--- a/canopeum_frontend/src/models/Coordinate.ts
+++ b/canopeum_frontend/src/models/Coordinate.ts
@@ -2,6 +2,10 @@ const VALID_CARDINALS = ['N', 'S', 'E', 'W'] as const
 
 export type Cardinal = typeof VALID_CARDINALS[number]
 
+// We default to no cardinality so we know the user forgot to input it
+// and we don't have to deal with non-numeric input (default to 0 for all fields)
+export type DefaultCoordinate = Omit<Coordinate, 'cardinal'> & { cardinal?: Coordinate['cardinal'] }
+
 export type Coordinate = {
   degrees: number,
   minutes: number,
@@ -10,20 +14,20 @@ export type Coordinate = {
   cardinal: Cardinal,
 }
 
-export const defaultLatitude: Coordinate = {
+export const defaultLatitude: DefaultCoordinate = {
   degrees: 0,
   minutes: 0,
   seconds: 0,
   miliseconds: 0,
-  cardinal: 'N',
+  cardinal: undefined,
 }
 
-export const defaultLongitude: Coordinate = {
+export const defaultLongitude: DefaultCoordinate = {
   degrees: 0,
   minutes: 0,
   seconds: 0,
   miliseconds: 0,
-  cardinal: 'W',
+  cardinal: undefined,
 }
 
 export const coordinateToString = (coord: Coordinate) =>
diff --git a/canopeum_frontend/src/pages/Analytics.tsx b/canopeum_frontend/src/pages/Analytics.tsx
index 25881c505..7e97a6135 100644
--- a/canopeum_frontend/src/pages/Analytics.tsx
+++ b/canopeum_frontend/src/pages/Analytics.tsx
@@ -10,7 +10,7 @@ import { AuthenticationContext } from '@components/context/AuthenticationContext
 import { LanguageContext } from '@components/context/LanguageContext'
 import { SnackbarContext } from '@components/context/SnackbarContext'
 import useApiClient from '@hooks/ApiClientHook'
-import { coordinateToString } from '@models/Coordinate'
+import { type Coordinate, coordinateToString } from '@models/Coordinate'
 import type { SiteSummary, User } from '@services/api'
 import { assetFormatter } from '@utils/assetFormatter'
 
@@ -65,8 +65,27 @@ const Analytics = () => {
         visibleOnMap,
       } = data
 
-      const latitude = coordinateToString(dmsLatitude)
-      const longitude = coordinateToString(dmsLongitude)
+      // TODO: In-form errors that are translated. To do with the validation refactoring
+      if (dmsLatitude.cardinal == null) {
+        openAlertSnackbar(
+          'Latitude must be specified',
+          { severity: 'error' },
+        )
+        return
+      }
+      if (dmsLongitude.cardinal == null) {
+        openAlertSnackbar(
+          'Longitude must be specified',
+          { severity: 'error' },
+        )
+        return
+      }
+
+      // @typescript-eslint/no-unsafe-type-assertion
+      // NOTE: Casting here isn't great (despite knowing that we just validated),
+      // but we need to refactor how we validate forms anyway
+      const latitude = coordinateToString(dmsLatitude as Coordinate)
+      const longitude = coordinateToString(dmsLongitude as Coordinate)
 
       const response = siteId
         ? getApiClient().siteClient.update(