diff --git a/helpers/lotOccupancyDB/getMap.d.ts b/helpers/lotOccupancyDB/getMap.d.ts
index 981ce7a3..ddfd203a 100644
--- a/helpers/lotOccupancyDB/getMap.d.ts
+++ b/helpers/lotOccupancyDB/getMap.d.ts
@@ -1,3 +1,3 @@
 import type * as recordTypes from '../../types/recordTypes';
-export declare function getMap(mapId: number | string): Promise<recordTypes.Map>;
+export declare function getMap(mapId: number | string): Promise<recordTypes.Map | undefined>;
 export default getMap;
diff --git a/helpers/lotOccupancyDB/getMap.js b/helpers/lotOccupancyDB/getMap.js
index 966d2c57..eaa2be1d 100644
--- a/helpers/lotOccupancyDB/getMap.js
+++ b/helpers/lotOccupancyDB/getMap.js
@@ -13,13 +13,14 @@ export async function getMap(mapId) {
         from Maps m
         left join Lots l on m.mapId = l.mapId and l.recordDelete_timeMillis is null
         where m.mapId = ?
+        and m.recordDelete_timeMillis is null
         group by m.mapId, m.mapName, m.mapDescription,
-            m.mapLatitude, m.mapLongitude, m.mapSVG,
-            m.mapAddress1, m.mapAddress2, m.mapCity, m.mapProvince, m.mapPostalCode,
-            m.mapPhoneNumber,
-            m.recordCreate_userName, m.recordCreate_timeMillis,
-            m.recordUpdate_userName, m.recordUpdate_timeMillis,
-            m.recordDelete_userName, m.recordDelete_timeMillis`)
+          m.mapLatitude, m.mapLongitude, m.mapSVG,
+          m.mapAddress1, m.mapAddress2, m.mapCity, m.mapProvince, m.mapPostalCode,
+          m.mapPhoneNumber,
+          m.recordCreate_userName, m.recordCreate_timeMillis,
+          m.recordUpdate_userName, m.recordUpdate_timeMillis,
+          m.recordDelete_userName, m.recordDelete_timeMillis`)
         .get(mapId);
     database.release();
     return map;
diff --git a/helpers/lotOccupancyDB/getMap.ts b/helpers/lotOccupancyDB/getMap.ts
index 093ec277..d6949f66 100644
--- a/helpers/lotOccupancyDB/getMap.ts
+++ b/helpers/lotOccupancyDB/getMap.ts
@@ -2,7 +2,9 @@ import { acquireConnection } from './pool.js'
 
 import type * as recordTypes from '../../types/recordTypes'
 
-export async function getMap(mapId: number | string): Promise<recordTypes.Map> {
+export async function getMap(
+  mapId: number | string
+): Promise<recordTypes.Map | undefined> {
   const database = await acquireConnection()
 
   const map: recordTypes.Map = database
@@ -18,13 +20,14 @@ export async function getMap(mapId: number | string): Promise<recordTypes.Map> {
         from Maps m
         left join Lots l on m.mapId = l.mapId and l.recordDelete_timeMillis is null
         where m.mapId = ?
+        and m.recordDelete_timeMillis is null
         group by m.mapId, m.mapName, m.mapDescription,
-            m.mapLatitude, m.mapLongitude, m.mapSVG,
-            m.mapAddress1, m.mapAddress2, m.mapCity, m.mapProvince, m.mapPostalCode,
-            m.mapPhoneNumber,
-            m.recordCreate_userName, m.recordCreate_timeMillis,
-            m.recordUpdate_userName, m.recordUpdate_timeMillis,
-            m.recordDelete_userName, m.recordDelete_timeMillis`
+          m.mapLatitude, m.mapLongitude, m.mapSVG,
+          m.mapAddress1, m.mapAddress2, m.mapCity, m.mapProvince, m.mapPostalCode,
+          m.mapPhoneNumber,
+          m.recordCreate_userName, m.recordCreate_timeMillis,
+          m.recordUpdate_userName, m.recordUpdate_timeMillis,
+          m.recordDelete_userName, m.recordDelete_timeMillis`
     )
     .get(mapId)