2 files changed, 4 insertions, 7 deletions
diff --git a/server/sonar-web/src/main/js/apps/component-measures/components/ComponentMeasuresApp.tsx b/server/sonar-web/src/main/js/apps/component-measures/components/ComponentMeasuresApp.tsx
index 33a9263ee3c..1d58466994b 100644
--- a/server/sonar-web/src/main/js/apps/component-measures/components/ComponentMeasuresApp.tsx
+++ b/server/sonar-web/src/main/js/apps/component-measures/components/ComponentMeasuresApp.tsx
@@ -20,10 +20,10 @@
 import { withTheme } from '@emotion/react';
 import styled from '@emotion/styled';
 import {
-  DeferredSpinner,
   LargeCenteredLayout,
   Note,
   PageContentFontWrapper,
+  Spinner,
   themeBorder,
   themeColor,
 } from 'design-system';
@@ -266,10 +266,7 @@ class ComponentMeasuresApp extends React.PureComponent<Props, State> {
         <Suggestions suggestions="component_measures" />
         <Helmet defer={false} title={translate('layout.measures')} />
         <PageContentFontWrapper>
-          <DeferredSpinner
-            className="my-10 sw-flex sw-content-center"
-            loading={this.state.loading}
-          />
+          <Spinner className="my-10 sw-flex sw-content-center" loading={this.state.loading} />
 
           {measures.length > 0 ? (
             <div className="sw-grid sw-grid-cols-12 sw-w-full">
diff --git a/server/sonar-web/src/main/js/apps/component-measures/components/MeasureOverview.tsx b/server/sonar-web/src/main/js/apps/component-measures/components/MeasureOverview.tsx
index 95a8382f216..4fb34c5cfa3 100644
--- a/server/sonar-web/src/main/js/apps/component-measures/components/MeasureOverview.tsx
+++ b/server/sonar-web/src/main/js/apps/component-measures/components/MeasureOverview.tsx
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-import { DeferredSpinner } from 'design-system';
+import { Spinner } from 'design-system';
 import * as React from 'react';
 import { getComponentLeaves } from '../../../api/components';
 import SourceViewer from '../../../components/SourceViewer/SourceViewer';
@@ -169,7 +169,7 @@ export default class MeasureOverview extends React.PureComponent<Props, State> {
         />
 
         <div className="sw-p-6">
-          <DeferredSpinner loading={loading} />
+          <Spinner loading={loading} />
           {!loading && this.renderContent(isFileComponent)}
         </div>
       </div>