diff --git a/src/mol-model/structure/model/types.ts b/src/mol-model/structure/model/types.ts
index a8390d1a4ba821b22ef0c382ea1a1de4ae1c3203..2798e67234ae10eef4c07293ba3c724554d88acf 100644
--- a/src/mol-model/structure/model/types.ts
+++ b/src/mol-model/structure/model/types.ts
@@ -241,7 +241,7 @@ export function getEntityType(compId: string): mmCIF_Schema['entity']['type']['T
 }
 
 export function isPolymer(moleculeType: MoleculeType) {
-    return moleculeType === MoleculeType.protein || moleculeType === MoleculeType.DNA || moleculeType === MoleculeType.RNA || moleculeType === MoleculeType.PNA
+    return isNucleic(moleculeType) || isProtein(moleculeType)
 }
 
 export function isNucleic(moleculeType: MoleculeType) {