diff --git a/helpers/lotOccupancyDB/moveOccupancyTypeFieldUp.js b/helpers/lotOccupancyDB/moveOccupancyTypeFieldUp.js
index 075a43c6..df02bab9 100644
--- a/helpers/lotOccupancyDB/moveOccupancyTypeFieldUp.js
+++ b/helpers/lotOccupancyDB/moveOccupancyTypeFieldUp.js
@@ -24,10 +24,7 @@ export const moveOccupancyTypeFieldUp = (occupancyTypeFieldId) => {
     const result = database
         .prepare("update OccupancyTypeFields" +
         " set orderNumber = ? - 1" +
-        " where occupancyTypeFieldId = ?" +
-        (currentField.occupancyTypeId
-            ? " and occupancyTypeId = '" + currentField.occupancyTypeId + "'"
-            : " and occupancyTypeId is null"))
+        " where occupancyTypeFieldId = ?")
         .run(currentField.orderNumber, occupancyTypeFieldId);
     database.close();
     clearOccupancyTypesCache();
diff --git a/helpers/lotOccupancyDB/moveOccupancyTypeFieldUp.ts b/helpers/lotOccupancyDB/moveOccupancyTypeFieldUp.ts
index 4ae4ccc7..a51f9c70 100644
--- a/helpers/lotOccupancyDB/moveOccupancyTypeFieldUp.ts
+++ b/helpers/lotOccupancyDB/moveOccupancyTypeFieldUp.ts
@@ -36,10 +36,7 @@ export const moveOccupancyTypeFieldUp = (occupancyTypeFieldId: number | string):
         .prepare(
             "update OccupancyTypeFields" +
                 " set orderNumber = ? - 1" +
-                " where occupancyTypeFieldId = ?" +
-                (currentField.occupancyTypeId
-                    ? " and occupancyTypeId = '" + currentField.occupancyTypeId + "'"
-                    : " and occupancyTypeId is null")
+                " where occupancyTypeFieldId = ?"
         )
         .run(currentField.orderNumber, occupancyTypeFieldId);