diff --git a/font-src/glyphs/common/derivatives.ptl b/font-src/glyphs/common/derivatives.ptl
index ad819c271..10e2c5827 100644
--- a/font-src/glyphs/common/derivatives.ptl
+++ b/font-src/glyphs/common/derivatives.ptl
@@ -16,7 +16,7 @@ glyph-block Common-Derivatives : begin
 				local dstName : shapeFrom + '.' + suffix
 				local dst : glyphStore.queryByName dstName
 				if dst : g.dependsOn dst
-				if (h.tag && h.rank) : begin
+				if (para.enableCvSs && h.tag && h.rank) : begin
 					[Cv h.tag h.rank].set g dstName
 					if h.nonDeriving : [Cv h.tag h.rank].setPreventDeriving g