diff --git a/csl/chicago-fullnote-bibliography.csl b/csl/chicago-fullnote-bibliography.csl
index 17e4f9f7ea..83e74f7ad7 100644
--- a/csl/chicago-fullnote-bibliography.csl
+++ b/csl/chicago-fullnote-bibliography.csl
@@ -287,7 +287,7 @@
         <text variable="volume" prefix=" "/>
         <text variable="issue" prefix=", no. "/>
       </if>
-      <else-if type="book">
+      <else-if type="book chapter" match="any">
         <group prefix=", " delimiter=", ">
           <group>
             <text term="volume" form="short" suffix=". "/>
@@ -312,20 +312,16 @@
         <text variable="volume" prefix=" "/>
         <text variable="issue" prefix=", no. "/>
       </if>
-      <else-if type="book">
+      <else-if type="book chapter" match="any">
         <group prefix=". " delimiter=". ">
           <group>
             <text term="volume" form="short" text-case="capitalize-first" suffix=". "/>
             <number variable="volume" form="numeric"/>
           </group>
-          <choose>
-            <if variable="locator" match="none">
           <group>
             <number variable="number-of-volumes" form="numeric"/>
             <text term="volume" form="short" prefix=" " suffix="." plural="true"/>
           </group>
-            </if>
-          </choose>
           <text variable="edition"/>
         </group>
       </else-if>
diff --git a/csl/chicago-note-bibliography.csl b/csl/chicago-note-bibliography.csl
index df768fdc21..99cfda2317 100644
--- a/csl/chicago-note-bibliography.csl
+++ b/csl/chicago-note-bibliography.csl
@@ -209,20 +209,16 @@
         <text variable="volume" prefix=" "/>
         <text variable="issue" prefix=", no. "/>
       </if>
-      <else-if type="book">
+      <else-if type="book chapter" match="any">
         <group prefix=". " delimiter=". ">
           <group>
-            <text term="volume" form="short"  text-case="capitalize-first" suffix=". "/>
+            <text term="volume" form="short" text-case="capitalize-first" suffix=". "/>
             <number variable="volume" form="numeric"/>
           </group>
-          <choose>
-            <if variable="locator" match="none">
           <group>
             <number variable="number-of-volumes" form="numeric"/>
             <text term="volume" form="short" prefix=" " suffix="." plural="true"/>
           </group>
-            </if>
-          </choose>
           <text variable="edition"/>
         </group>
       </else-if>