diff --git a/packages/app-shell/rollup.config.js b/packages/app-shell/rollup.config.js
index 33c141cf98b52d6ab0d769310c5772511a01134b..868975d732b1b10c02f08b5947923217de318346 100644
--- a/packages/app-shell/rollup.config.js
+++ b/packages/app-shell/rollup.config.js
@@ -22,7 +22,7 @@ export default (async () => {
           },
         onwarn: function (warning, warn) {
             // ignore chai warnings
-            if (warning.code === 'CIRCULAR_DEPENDENCY') {
+            if (warning.code === 'CIRCULAR_DEPENDENCY' && warning.message.includes('/chai/')) {
                 return;
             }
             warn(warning);
diff --git a/packages/auth/rollup.config.js b/packages/auth/rollup.config.js
index 50a752683551b640e9972b2d68d0c110dad60487..abdacf28865514847be9c5bd0e0efe38037839e7 100644
--- a/packages/auth/rollup.config.js
+++ b/packages/auth/rollup.config.js
@@ -24,7 +24,7 @@ export default (async () => {
         },
         onwarn: function (warning, warn) {
             // ignore chai warnings
-            if (warning.code === 'CIRCULAR_DEPENDENCY') {
+            if (warning.code === 'CIRCULAR_DEPENDENCY' && warning.message.includes('/chai/')) {
                 return;
             }
             warn(warning);
diff --git a/packages/check-in-place-select/rollup.config.js b/packages/check-in-place-select/rollup.config.js
index 4088d708d524bd64079fae5fe33ad3164e1c24d4..384e0e65187617bf1a853d45e5ae37aa5a2539e2 100644
--- a/packages/check-in-place-select/rollup.config.js
+++ b/packages/check-in-place-select/rollup.config.js
@@ -24,7 +24,7 @@ export default (async () => {
         },
         onwarn: function (warning, warn) {
             // ignore chai warnings
-            if (warning.code === 'CIRCULAR_DEPENDENCY') {
+            if (warning.code === 'CIRCULAR_DEPENDENCY' && warning.message.includes('/chai/')) {
                 return;
             }
             warn(warning);
diff --git a/packages/common/rollup.config.js b/packages/common/rollup.config.js
index 778a8eefee24f910cb3c014e1871ac0db2b2bccb..217b68142094ea6e692b2cfde6dd1e34b3c8b9be 100644
--- a/packages/common/rollup.config.js
+++ b/packages/common/rollup.config.js
@@ -23,7 +23,7 @@ export default (async () => {
         },
         onwarn: function (warning, warn) {
             // ignore chai warnings
-            if (warning.code === 'CIRCULAR_DEPENDENCY') {
+            if (warning.code === 'CIRCULAR_DEPENDENCY' && warning.message.includes('/chai/')) {
             return;
             }
             warn(warning);
diff --git a/packages/data-table-view/rollup.config.js b/packages/data-table-view/rollup.config.js
index be445c3cdc6ebd9e3849a544ea98d1dc54ad2a75..bf17e14a04bd78f163213d43b879721ab3a17378 100644
--- a/packages/data-table-view/rollup.config.js
+++ b/packages/data-table-view/rollup.config.js
@@ -29,7 +29,7 @@ export default (async () => {
                 return;
             }
             // ignore chai warnings
-            if (warning.code === 'CIRCULAR_DEPENDENCY') {
+            if (warning.code === 'CIRCULAR_DEPENDENCY' && warning.message.includes('/chai/')) {
                 return;
             }
             warn(warning);
diff --git a/packages/file-handling/rollup.config.js b/packages/file-handling/rollup.config.js
index 1ced5fa53c28aed98a3bf53b0d52de06810eb2c2..82af637ba40993c11bfed0ea74a61238f449baf2 100644
--- a/packages/file-handling/rollup.config.js
+++ b/packages/file-handling/rollup.config.js
@@ -27,7 +27,7 @@ export default (async () => {
         },
         onwarn: function (warning, warn) {
             // ignore chai warnings
-            if (warning.code === 'CIRCULAR_DEPENDENCY') {
+            if (warning.code === 'CIRCULAR_DEPENDENCY' && warning.message.includes('/chai/')) {
                 return;
             }
             warn(warning);
diff --git a/packages/knowledge-base-web-page-element-view/rollup.config.js b/packages/knowledge-base-web-page-element-view/rollup.config.js
index 62f509de2e40bf5237a99849b6c30a75da1a5150..9fda204654ebeb80d0d56d13478452bcca081a57 100644
--- a/packages/knowledge-base-web-page-element-view/rollup.config.js
+++ b/packages/knowledge-base-web-page-element-view/rollup.config.js
@@ -24,7 +24,7 @@ export default (async () => {
         },
         onwarn: function (warning, warn) {
             // ignore chai warnings
-            if (warning.code === 'CIRCULAR_DEPENDENCY') {
+            if (warning.code === 'CIRCULAR_DEPENDENCY' && warning.message.includes('/chai/')) {
                 return;
             }
             warn(warning);
diff --git a/packages/language-select/rollup.config.js b/packages/language-select/rollup.config.js
index 87167285d8bab4c641b7b6fce2a6c52c3903f43b..17a88b977ecebaa68133f6e042a9502e0bd763d0 100644
--- a/packages/language-select/rollup.config.js
+++ b/packages/language-select/rollup.config.js
@@ -21,7 +21,7 @@ export default {
     },
     onwarn: function (warning, warn) {
         // ignore chai warnings
-        if (warning.code === 'CIRCULAR_DEPENDENCY') {
+        if (warning.code === 'CIRCULAR_DEPENDENCY' && warning.message.includes('/chai/')) {
             return;
         }
         warn(warning);
diff --git a/packages/matomo/rollup.config.js b/packages/matomo/rollup.config.js
index 8b5f36c449fd75b1de39ea406c5fdeb05d0078e8..bae3922efee20a068cc93f37c7fc788f0d4ac7b8 100644
--- a/packages/matomo/rollup.config.js
+++ b/packages/matomo/rollup.config.js
@@ -52,7 +52,7 @@ export default (async () => {
         },
         onwarn: function (warning, warn) {
             // ignore chai warnings
-            if (warning.code === 'CIRCULAR_DEPENDENCY') {
+            if (warning.code === 'CIRCULAR_DEPENDENCY' && warning.message.includes('/chai/')) {
                 return;
             }
             warn(warning);
diff --git a/packages/notification/rollup.config.js b/packages/notification/rollup.config.js
index 7fd750a296a62b8b2950146c9d911b391a492ca4..867ad09e3885c07aeae5592b630e8ebed4cfc50a 100644
--- a/packages/notification/rollup.config.js
+++ b/packages/notification/rollup.config.js
@@ -22,7 +22,7 @@ export default {
     },
     onwarn: function (warning, warn) {
         // ignore chai warnings
-        if (warning.code === 'CIRCULAR_DEPENDENCY') {
+        if (warning.code === 'CIRCULAR_DEPENDENCY' && warning.message.includes('/chai/')) {
             return;
         }
         warn(warning);
diff --git a/packages/organization-select/rollup.config.js b/packages/organization-select/rollup.config.js
index e7682903a7c7de5e0a525928b9f980ac55555c4e..d58061c35dea6267ca3bbf75feda42c9821e2539 100644
--- a/packages/organization-select/rollup.config.js
+++ b/packages/organization-select/rollup.config.js
@@ -24,7 +24,7 @@ export default (async () => {
         },
         onwarn: function (warning, warn) {
             // ignore chai warnings
-            if (warning.code === 'CIRCULAR_DEPENDENCY') {
+            if (warning.code === 'CIRCULAR_DEPENDENCY' && warning.message.includes('/chai/')) {
                 return;
             }
             warn(warning);
diff --git a/packages/person-profile/rollup.config.js b/packages/person-profile/rollup.config.js
index 67ac2641528f8b8097c25a30e6cb9b6e1b318605..59d995bed24b2cbd0df5c45c4e0c7197ccdb3528 100644
--- a/packages/person-profile/rollup.config.js
+++ b/packages/person-profile/rollup.config.js
@@ -25,7 +25,7 @@ export default (async () => {
         },
         onwarn: function (warning, warn) {
             // ignore chai warnings
-            if (warning.code === 'CIRCULAR_DEPENDENCY') {
+            if (warning.code === 'CIRCULAR_DEPENDENCY' && warning.message.includes('/chai/')) {
                 return;
             }
             warn(warning);
diff --git a/packages/person-select/rollup.config.js b/packages/person-select/rollup.config.js
index 17208ef6a675cc564b74a7a77eda8d9abd94044f..d0dc05e95519b4935c1a7394a5ae13dbffd88e43 100644
--- a/packages/person-select/rollup.config.js
+++ b/packages/person-select/rollup.config.js
@@ -24,7 +24,7 @@ export default (async () => {
         },
         onwarn: function (warning, warn) {
             // ignore chai warnings
-            if (warning.code === 'CIRCULAR_DEPENDENCY') {
+            if (warning.code === 'CIRCULAR_DEPENDENCY' && warning.message.includes('/chai/')) {
                 return;
             }
             warn(warning);
diff --git a/packages/provider/rollup.config.js b/packages/provider/rollup.config.js
index d847e3a450584c42d9de9f9e353a76615843e338..b95c9317ef89fa7ffef2d0e2a5b2e5aecb8a9940 100644
--- a/packages/provider/rollup.config.js
+++ b/packages/provider/rollup.config.js
@@ -50,7 +50,7 @@ export default (async () => {
         },
         onwarn: function (warning, warn) {
             // ignore chai warnings
-            if (warning.code === 'CIRCULAR_DEPENDENCY') {
+            if (warning.code === 'CIRCULAR_DEPENDENCY' && warning.message.includes('chai')) {
                 return;
             }
             warn(warning);
diff --git a/packages/qr-code-scanner/rollup.config.js b/packages/qr-code-scanner/rollup.config.js
index 90f37c6e116b6375729ccb68e8b14b8518e44c6b..aa6e0f8a4dd7a25e6a27bd94ce8be8dfaedb657e 100644
--- a/packages/qr-code-scanner/rollup.config.js
+++ b/packages/qr-code-scanner/rollup.config.js
@@ -46,7 +46,7 @@ export default (async () => {
         },
         onwarn: function (warning, warn) {
             // ignore chai warnings
-            if (warning.code === 'CIRCULAR_DEPENDENCY') {
+            if (warning.code === 'CIRCULAR_DEPENDENCY' && warning.message.includes('/chai/')) {
                 return;
             }
             warn(warning);
diff --git a/packages/typescript-example/rollup.config.js b/packages/typescript-example/rollup.config.js
index 68cd9eb69a678944f36f19d961f1462a12a3c030..6dae7eda372f53210181ae578aec8b3838c3633a 100644
--- a/packages/typescript-example/rollup.config.js
+++ b/packages/typescript-example/rollup.config.js
@@ -22,7 +22,7 @@ export default {
     },
     onwarn: function (warning, warn) {
         // ignore chai warnings
-        if (warning.code === 'CIRCULAR_DEPENDENCY') {
+        if (warning.code === 'CIRCULAR_DEPENDENCY' && warning.message.includes('/chai/')) {
             return;
         }
         warn(warning);
diff --git a/toolkit-showcase/rollup.config.js b/toolkit-showcase/rollup.config.js
index e36ea321f013220cf0ee6c7d39b1e267b39596df..c850547c15aea27801cb3f163d0872eef053dd86 100644
--- a/toolkit-showcase/rollup.config.js
+++ b/toolkit-showcase/rollup.config.js
@@ -87,7 +87,7 @@ export default (async () => {
             return;
         }
         // ignore chai warnings
-        if (warning.code === 'CIRCULAR_DEPENDENCY') {
+        if (warning.code === 'CIRCULAR_DEPENDENCY' && warning.message.includes('/chai/')) {
           return;
         }
         warn(warning);