diff --git a/packages/core/component-doc.json b/packages/core/component-doc.json
index a020e50326e..28c9c97c6c8 100644
--- a/packages/core/component-doc.json
+++ b/packages/core/component-doc.json
@@ -7595,7 +7595,7 @@
       "usage": {},
       "docs": "",
       "docsTags": [],
-      "encapsulation": "scoped",
+      "encapsulation": "shadow",
       "dependents": [
         "ix-upload"
       ],
diff --git a/packages/core/src/components/spinner/spinner.scss b/packages/core/src/components/spinner/spinner.scss
index 41e1666651f..4b295e17822 100644
--- a/packages/core/src/components/spinner/spinner.scss
+++ b/packages/core/src/components/spinner/spinner.scss
@@ -7,7 +7,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+@import 'mixins/shadow-dom/component';
+
 :host {
+  @include ix-component;
+
   display: flex;
   position: relative;
   height: 2rem;
diff --git a/packages/core/src/components/spinner/spinner.tsx b/packages/core/src/components/spinner/spinner.tsx
index a79d1a52f88..c490cad7b40 100644
--- a/packages/core/src/components/spinner/spinner.tsx
+++ b/packages/core/src/components/spinner/spinner.tsx
@@ -12,7 +12,7 @@ import { Component, h, Host, Prop } from '@stencil/core';
 @Component({
   tag: 'ix-spinner',
   styleUrl: 'spinner.scss',
-  scoped: true,
+  shadow: true,
 })
 export class Spinner {
   /**