diff --git a/docs/MSC2140_MSC2134.md b/docs/MSC2140_MSC2134.md
index 1661c57..e370b30 100644
--- a/docs/MSC2140_MSC2134.md
+++ b/docs/MSC2140_MSC2134.md
@@ -110,7 +110,7 @@ For sql provider (i.e. for the `synapseSql`):
 ```.yaml
 synapseSql:
   lookup:
-    query: 'select user_id as mxid, medium, address from user_threepids' # query for retrive 3PIDs for hashes.
+    query: 'select user_id as mxid, medium, address from user_threepid_id_server' # query for retrive 3PIDs for hashes.
 ```
 
 For general sql provider:
diff --git a/ma1sd.example.yaml b/ma1sd.example.yaml
index 9b27e25..81e462c 100644
--- a/ma1sd.example.yaml
+++ b/ma1sd.example.yaml
@@ -129,7 +129,7 @@ threepid:
 ### hash lookup for synapseSql provider.
 # synapseSql:
 #   lookup:
-#     query: 'select user_id as mxid, medium, address from user_threepids' # query for retrive 3PIDs for hashes.
+#     query: 'select user_id as mxid, medium, address from user_threepid_id_server' # query for retrive 3PIDs for hashes.
 #   legacyRoomNames: false  # use the old query to get room names.
 
 ### hash lookup for ldap provider (with example of the ldap configuration)
diff --git a/src/main/java/io/kamax/mxisd/config/sql/SqlConfig.java b/src/main/java/io/kamax/mxisd/config/sql/SqlConfig.java
index 75c2687..b4e168e 100644
--- a/src/main/java/io/kamax/mxisd/config/sql/SqlConfig.java
+++ b/src/main/java/io/kamax/mxisd/config/sql/SqlConfig.java
@@ -125,7 +125,7 @@ public abstract class SqlConfig {
     }
 
     public static class Lookup {
-        private String query = "SELECT user_id AS mxid, medium, address from user_threepids";
+        private String query = "SELECT user_id AS mxid, medium, address from user_threepid_id_server";
 
         public String getQuery() {
             return query;
@@ -140,7 +140,7 @@ public abstract class SqlConfig {
 
         private Boolean enabled;
         private String type = "mxid";
-        private String query = "SELECT user_id AS uid FROM user_threepids WHERE medium = ? AND address = ?";
+        private String query = "SELECT user_id AS uid FROM user_threepid_id_server WHERE medium = ? AND address = ?";
         private Map<String, String> medium = new HashMap<>();
 
         public Boolean isEnabled() {
diff --git a/src/main/java/io/kamax/mxisd/config/sql/synapse/SynapseSqlProviderConfig.java b/src/main/java/io/kamax/mxisd/config/sql/synapse/SynapseSqlProviderConfig.java
index 9359362..bd8665a 100644
--- a/src/main/java/io/kamax/mxisd/config/sql/synapse/SynapseSqlProviderConfig.java
+++ b/src/main/java/io/kamax/mxisd/config/sql/synapse/SynapseSqlProviderConfig.java
@@ -56,7 +56,7 @@ public class SynapseSqlProviderConfig extends SqlConfig {
 
         if (getIdentity().isEnabled() && StringUtils.isBlank(getIdentity().getType())) {
             getIdentity().setType("mxid");
-            getIdentity().setQuery("SELECT user_id AS uid FROM user_threepids WHERE medium = ? AND address = ?");
+            getIdentity().setQuery("SELECT user_id AS uid FROM user_threepid_id_server WHERE medium = ? AND address = ?");
         }
 
         if (getProfile().isEnabled()) {