diff --git a/db/migrate/20180613045614_add_contacts_and_domains_uuid_uniq_constraint.rb b/db/migrate/20180613045614_add_contacts_and_domains_uuid_uniq_constraint.rb
new file mode 100644
index 000000000..99e9b823d
--- /dev/null
+++ b/db/migrate/20180613045614_add_contacts_and_domains_uuid_uniq_constraint.rb
@@ -0,0 +1,15 @@
+class AddContactsAndDomainsUuidUniqConstraint < ActiveRecord::Migration
+  def up
+    execute <<-SQL
+      ALTER TABLE contacts ADD CONSTRAINT uniq_contact_uuid UNIQUE (uuid);
+      ALTER TABLE domains ADD CONSTRAINT uniq_domain_uuid UNIQUE (uuid);
+    SQL
+  end
+
+  def down
+    execute <<-SQL
+      ALTER TABLE contacts DROP CONSTRAINT uniq_contact_uuid;
+      ALTER TABLE domains DROP CONSTRAINT uniq_domain_uuid;
+    SQL
+  end
+end
diff --git a/db/structure.sql b/db/structure.sql
index 9b53ad323..b491b6f5a 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -3258,6 +3258,22 @@ ALTER TABLE ONLY settings
     ADD CONSTRAINT settings_pkey PRIMARY KEY (id);
 
 
+--
+-- Name: uniq_contact_uuid; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: 
+--
+
+ALTER TABLE ONLY contacts
+    ADD CONSTRAINT uniq_contact_uuid UNIQUE (uuid);
+
+
+--
+-- Name: uniq_domain_uuid; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: 
+--
+
+ALTER TABLE ONLY domains
+    ADD CONSTRAINT uniq_domain_uuid UNIQUE (uuid);
+
+
 --
 -- Name: unique_code; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: 
 --
@@ -4740,3 +4756,5 @@ INSERT INTO schema_migrations (version) VALUES ('20180612042953');
 
 INSERT INTO schema_migrations (version) VALUES ('20180613030330');
 
+INSERT INTO schema_migrations (version) VALUES ('20180613045614');
+