diff --git a/db/migrations/00021_globalid_not_null.sql b/db/migrations/00021_globalid_not_null.sql
new file mode 100644
index 00000000..4e78ab8e
--- /dev/null
+++ b/db/migrations/00021_globalid_not_null.sql
@@ -0,0 +1,57 @@
+-- +goose Up
+ALTER TABLE fieldseeker.containerrelate ALTER COLUMN globalid SET NOT NULL;
+ALTER TABLE fieldseeker.fieldscoutinglog ALTER COLUMN globalid SET NOT NULL;
+ALTER TABLE fieldseeker.habitatrelate ALTER COLUMN globalid SET NOT NULL;
+ALTER TABLE fieldseeker.inspectionsample ALTER COLUMN globalid SET NOT NULL;
+ALTER TABLE fieldseeker.inspectionsampledetail ALTER COLUMN globalid SET NOT NULL;
+ALTER TABLE fieldseeker.linelocation ALTER COLUMN globalid SET NOT NULL;
+ALTER TABLE fieldseeker.locationtracking ALTER COLUMN globalid SET NOT NULL;
+ALTER TABLE fieldseeker.mosquitoinspection ALTER COLUMN globalid SET NOT NULL;
+ALTER TABLE fieldseeker.pointlocation ALTER COLUMN globalid SET NOT NULL;
+ALTER TABLE fieldseeker.polygonlocation ALTER COLUMN globalid SET NOT NULL;
+ALTER TABLE fieldseeker.pool ALTER COLUMN globalid SET NOT NULL;
+ALTER TABLE fieldseeker.pooldetail ALTER COLUMN globalid SET NOT NULL;
+ALTER TABLE fieldseeker.proposedtreatmentarea ALTER COLUMN globalid SET NOT NULL;
+ALTER TABLE fieldseeker.qamosquitoinspection ALTER COLUMN globalid SET NOT NULL;
+ALTER TABLE fieldseeker.rodentlocation ALTER COLUMN globalid SET NOT NULL;
+ALTER TABLE fieldseeker.samplecollection ALTER COLUMN globalid SET NOT NULL;
+ALTER TABLE fieldseeker.samplelocation ALTER COLUMN globalid SET NOT NULL;
+ALTER TABLE fieldseeker.servicerequest ALTER COLUMN globalid SET NOT NULL;
+ALTER TABLE fieldseeker.speciesabundance ALTER COLUMN globalid SET NOT NULL;
+ALTER TABLE fieldseeker.stormdrain ALTER COLUMN globalid SET NOT NULL;
+ALTER TABLE fieldseeker.timecard ALTER COLUMN globalid SET NOT NULL;
+ALTER TABLE fieldseeker.trapdata ALTER COLUMN globalid SET NOT NULL;
+ALTER TABLE fieldseeker.traplocation ALTER COLUMN globalid SET NOT NULL;
+ALTER TABLE fieldseeker.treatment ALTER COLUMN globalid SET NOT NULL;
+ALTER TABLE fieldseeker.treatmentarea ALTER COLUMN globalid SET NOT NULL;
+ALTER TABLE fieldseeker.zones ALTER COLUMN globalid SET NOT NULL;
+ALTER TABLE fieldseeker.zones2 ALTER COLUMN globalid SET NOT NULL;
+
+-- +goose Down
+ALTER TABLE fieldseeker.containerrelate ALTER COLUMN globalid DROP NOT NULL;
+ALTER TABLE fieldseeker.fieldscoutinglog ALTER COLUMN globalid DROP NOT NULL;
+ALTER TABLE fieldseeker.habitatrelate ALTER COLUMN globalid DROP NOT NULL;
+ALTER TABLE fieldseeker.inspectionsample ALTER COLUMN globalid DROP NOT NULL;
+ALTER TABLE fieldseeker.inspectionsampledetail ALTER COLUMN globalid DROP NOT NULL;
+ALTER TABLE fieldseeker.linelocation ALTER COLUMN globalid DROP NOT NULL;
+ALTER TABLE fieldseeker.locationtracking ALTER COLUMN globalid DROP NOT NULL;
+ALTER TABLE fieldseeker.mosquitoinspection ALTER COLUMN globalid DROP NOT NULL;
+ALTER TABLE fieldseeker.pointlocation ALTER COLUMN globalid DROP NOT NULL;
+ALTER TABLE fieldseeker.polygonlocation ALTER COLUMN globalid DROP NOT NULL;
+ALTER TABLE fieldseeker.pool ALTER COLUMN globalid DROP NOT NULL;
+ALTER TABLE fieldseeker.pooldetail ALTER COLUMN globalid DROP NOT NULL;
+ALTER TABLE fieldseeker.proposedtreatmentarea ALTER COLUMN globalid DROP NOT NULL;
+ALTER TABLE fieldseeker.qamosquitoinspection ALTER COLUMN globalid DROP NOT NULL;
+ALTER TABLE fieldseeker.rodentlocation ALTER COLUMN globalid DROP NOT NULL;
+ALTER TABLE fieldseeker.samplecollection ALTER COLUMN globalid DROP NOT NULL;
+ALTER TABLE fieldseeker.samplelocation ALTER COLUMN globalid DROP NOT NULL;
+ALTER TABLE fieldseeker.servicerequest ALTER COLUMN globalid DROP NOT NULL;
+ALTER TABLE fieldseeker.speciesabundance ALTER COLUMN globalid DROP NOT NULL;
+ALTER TABLE fieldseeker.stormdrain ALTER COLUMN globalid DROP NOT NULL;
+ALTER TABLE fieldseeker.timecard ALTER COLUMN globalid DROP NOT NULL;
+ALTER TABLE fieldseeker.trapdata ALTER COLUMN globalid DROP NOT NULL;
+ALTER TABLE fieldseeker.traplocation ALTER COLUMN globalid DROP NOT NULL;
+ALTER TABLE fieldseeker.treatment ALTER COLUMN globalid DROP NOT NULL;
+ALTER TABLE fieldseeker.treatmentarea ALTER COLUMN globalid DROP NOT NULL;
+ALTER TABLE fieldseeker.zones ALTER COLUMN globalid DROP NOT NULL;
+ALTER TABLE fieldseeker.zones2 ALTER COLUMN globalid DROP NOT NULL;