diff --git a/sql/upgrades/167.sql b/sql/upgrades/167.sql
index 41a2f21b..ae7c03fa 100644
--- a/sql/upgrades/167.sql
+++ b/sql/upgrades/167.sql
@@ -1,11 +1,16 @@
 -- SWH DB schema upgrade
 -- from_version: 166
 -- to_version: 167
 -- description: Make origin_visit_status.type not null
 
 insert into dbversion(version, release, description)
       values(167, now(), 'Work In Progress');
 
--- Data migrated, all values populated now
+-- (blocking) Data migrated, all values populated now, so we can add the constraint
+-- alter table origin_visit_status alter column type set not null;
+
+-- (unblocking) functionally equivalent constraint
 alter table origin_visit_status
-  alter column type set not null;
+  add constraint type_not_null check (type is not null) not valid;
+
+alter table origin_visit_status validate constraint type_not_null;