diff --git a/app/organisation/rest.py b/app/organisation/rest.py
index c78ef2b47..fbfe09d22 100644
--- a/app/organisation/rest.py
+++ b/app/organisation/rest.py
@@ -34,7 +34,7 @@ def handle_integrity_error(exc):
     if 'ix_organisation_name' in str(exc):
         return jsonify(result="error",
                        message="Organisation name already exists"), 400
-    if 'domain_organisation_id_fkey' in str(exc):
+    if 'duplicate key value violates unique constraint "domain_pkey"' in str(exc):
         return jsonify(result='error',
                        message='Domain already exists'), 400
 
diff --git a/tests/app/organisation/test_rest.py b/tests/app/organisation/test_rest.py
index 62a2db21c..0a70baa52 100644
--- a/tests/app/organisation/test_rest.py
+++ b/tests/app/organisation/test_rest.py
@@ -328,6 +328,7 @@ def test_post_update_organisation_gives_404_status_if_org_does_not_exist(admin_r
 
 def test_post_update_organisation_returns_400_if_domain_is_duplicate(admin_request, notify_db_session):
     org = create_organisation()
+    org2 = create_organisation(name='Second org')
     create_domain('same.com', org.id)
 
     data = {'domains': ['new.com', 'same.com']}
@@ -335,7 +336,7 @@ def test_post_update_organisation_returns_400_if_domain_is_duplicate(admin_reque
     response = admin_request.post(
         'organisation.update_organisation',
         _data=data,
-        organisation_id='31d42ce6-3dac-45a7-95cb-94423d5ca03c',
+        organisation_id=org2.id,
         _expected_status=400
     )