diff --git a/csl/chicago-note-no-ibid.csl b/csl/chicago-note-no-ibid.csl
index 75825c8a5..f85881c63 100644
--- a/csl/chicago-note-no-ibid.csl
+++ b/csl/chicago-note-no-ibid.csl
@@ -246,11 +246,22 @@
     </choose>
   </macro>
   <macro name="archive">
-    <group delimiter=", ">
+	<choose>
+	  <if type="graphic report" match="any">
+        <group delimiter=", ">
       <text variable="archive_location"/>
       <text variable="archive"/>
       <text variable="archive-place"/>
-    </group>
+        </group>
+	  </if>
+	  <else-if type="book thesis chapter article-journal article-newspaper article-magazine" match="none">
+        <group delimiter=", ">
+      <text variable="archive_location"/>
+      <text variable="archive"/>
+      <text variable="archive-place"/>
+        </group>
+	  </else-if>
+	</choose>
   </macro>
   <macro name="access">
     <group delimiter=", ">
diff --git a/csl/chicago-note.csl b/csl/chicago-note.csl
index c62f77f6d..7934bf48c 100644
--- a/csl/chicago-note.csl
+++ b/csl/chicago-note.csl
@@ -246,11 +246,22 @@
     </choose>
   </macro>
   <macro name="archive">
-    <group delimiter=", ">
+	<choose>
+	  <if type="graphic report" match="any">
+        <group delimiter=", ">
       <text variable="archive_location"/>
       <text variable="archive"/>
       <text variable="archive-place"/>
-    </group>
+        </group>
+	  </if>
+	  <else-if type="book thesis chapter article-journal article-newspaper article-magazine" match="none">
+        <group delimiter=", ">
+      <text variable="archive_location"/>
+      <text variable="archive"/>
+      <text variable="archive-place"/>
+        </group>
+	  </else-if>
+	</choose>
   </macro>
   <macro name="access">
     <group delimiter=", ">