diff --git a/src/mol-geo/representation/structure/units-visual.ts b/src/mol-geo/representation/structure/units-visual.ts
index 8184f2f1b3ecf224938d344213c603f59c307c5b..3bfdf283a03bb824cd7bf353d84b9cd9007edfad 100644
--- a/src/mol-geo/representation/structure/units-visual.ts
+++ b/src/mol-geo/representation/structure/units-visual.ts
@@ -71,6 +71,7 @@ export function UnitsMeshVisual<P extends UnitsMeshProps>(builder: UnitsMeshVisu
         if (!renderObject) return
 
         const newProps = Object.assign({}, currentProps, props)
+        newProps.colorTheme.structure = currentStructure
         const unit = currentGroup.units[0]
 
         locationIt.reset()
@@ -131,7 +132,6 @@ export function UnitsMeshVisual<P extends UnitsMeshProps>(builder: UnitsMeshVisu
             } else {
                 if (group && !areGroupsIdentical(group, currentGroup)) {
                     currentGroup = group
-                    currentProps.colorTheme.structure = currentStructure
                 }
                 await update(ctx, props)
             }