diff --git a/plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/model/ERDEntity.java b/plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/model/ERDEntity.java
index a7e69de855c689bf8e6566fab72e5cf772f9d911..5d56fe890728e21f8046be653b9d0f9554245992 100644
--- a/plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/model/ERDEntity.java
+++ b/plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/model/ERDEntity.java
@@ -258,6 +258,7 @@ public class ERDEntity extends ERDObject<DBSEntity>
             }
             try {
 
+                DBSObjectFilter columnFilter = entity.getDataSource().getContainer().getObjectFilter(DBSEntityAttribute.class, entity, false);
                 Collection<? extends DBSEntityAttribute> attributes = entity.getAttributes(monitor);
                 if (!CommonUtils.isEmpty(attributes)) {
                     for (DBSEntityAttribute attribute : attributes) {
@@ -270,6 +271,10 @@ public class ERDEntity extends ERDObject<DBSEntity>
                             // Skip hidden attributes
                             continue;
                         }
+                        if (columnFilter != null && !columnFilter.matches(attribute.getName())) {
+                            continue;
+                        }
+
                         switch (attributeVisibility) {
                             case PRIMARY:
                                 if (idColumns == null || !idColumns.contains(attribute)) {