diff --git a/src/components/content/catalog/services/details/ServiceProvider.tsx b/src/components/content/catalog/services/details/ServiceProvider.tsx
index c3ea2f878..0e1ea3344 100644
--- a/src/components/content/catalog/services/details/ServiceProvider.tsx
+++ b/src/components/content/catalog/services/details/ServiceProvider.tsx
@@ -6,7 +6,7 @@
 import { EnvironmentOutlined } from '@ant-design/icons';
 import { Empty, Image, Tabs } from 'antd';
 import { Tab } from 'rc-tabs/lib/interface';
-import React, { useMemo, useState } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
 import { createSearchParams, useNavigate, useSearchParams } from 'react-router-dom';
 import catalogStyles from '../../../../../styles/catalog.module.css';
 import { ServiceTemplateDetailVo, category, name, serviceRegistrationState } from '../../../../../xpanse-api/generated';
@@ -25,6 +25,7 @@ import { cspMap } from '../../../common/csp/CspLogo';
 import { DeleteResult } from '../delete/DeleteResult';
 import DeleteService from '../delete/DeleteService';
 import { ServicePolicies } from '../policies/ServicePolicies';
+import { useReRegisterRequest } from '../re-register/ReRegisterMutation';
 import { ReRegisterResult } from '../re-register/ReRegisterResult';
 import ReRegisterService from '../re-register/ReRegisterService';
 import { UnregisterResult } from '../unregister/UnregisterResult';
@@ -145,6 +146,18 @@ function ServiceProvider({
         }
     }
 
+    const reRegisterRequest = useReRegisterRequest(activeServiceDetail ? activeServiceDetail.serviceTemplateId : '');
+    useEffect(() => {
+        if (reRegisterRequest.isSuccess) {
+            setIsDeleteDisabled(true);
+        }
+    }, [reRegisterRequest.isSuccess, setIsDeleteDisabled]);
+
+    const reRegister = () => {
+        setIsViewDisabled(true);
+        reRegisterRequest.mutate();
+    };
+
     const onChangeCsp = (key: string) => {
         navigate({
             pathname: catalogPageRoute,
@@ -205,10 +218,9 @@ function ServiceProvider({
                                     }
                                 />
                                 <ReRegisterService
-                                    id={activeServiceDetail.serviceTemplateId}
-                                    setIsViewDisabled={setIsViewDisabled}
                                     isReRegisterDisabled={isReRegisterDisabled}
-                                    setIsDeleteDisabled={setIsDeleteDisabled}
+                                    isReTrySuccess={reRegisterRequest.isSuccess}
+                                    reRegister={reRegister}
                                     serviceRegistrationStatus={
                                         activeServiceDetail.serviceRegistrationState as serviceRegistrationState
                                     }
diff --git a/src/components/content/catalog/services/re-register/ReRegisterService.tsx b/src/components/content/catalog/services/re-register/ReRegisterService.tsx
index 60a291985..9ba8209e2 100644
--- a/src/components/content/catalog/services/re-register/ReRegisterService.tsx
+++ b/src/components/content/catalog/services/re-register/ReRegisterService.tsx
@@ -8,30 +8,18 @@ import { Button, Popconfirm } from 'antd';
 import React from 'react';
 import catalogStyles from '../../../../../styles/catalog.module.css';
 import { serviceRegistrationState } from '../../../../../xpanse-api/generated';
-import { useReRegisterRequest } from './ReRegisterMutation';
 
 function ReRegisterService({
-    id,
-    setIsViewDisabled,
     isReRegisterDisabled,
-    setIsDeleteDisabled,
+    reRegister,
+    isReTrySuccess,
     serviceRegistrationStatus,
 }: {
-    id: string;
-    setIsViewDisabled: (isViewDisabled: boolean) => void;
     isReRegisterDisabled: boolean;
-    setIsDeleteDisabled: (isDelete: boolean) => void;
+    reRegister: () => void;
+    isReTrySuccess: boolean;
     serviceRegistrationStatus: serviceRegistrationState;
 }): React.JSX.Element {
-    const reRegisterRequest = useReRegisterRequest(id);
-    if (reRegisterRequest.isSuccess) {
-        setIsDeleteDisabled(true);
-    }
-    const reRegister = () => {
-        setIsViewDisabled(true);
-        reRegisterRequest.mutate();
-    };
-
     return (
         <div className={catalogStyles.updateUnregisterBtnClass}>
             <Popconfirm
@@ -48,7 +36,7 @@ function ReRegisterService({
                     type='primary'
                     className={catalogStyles.catalogManageBtnClass}
                     disabled={
-                        reRegisterRequest.isSuccess ||
+                        isReTrySuccess ||
                         isReRegisterDisabled ||
                         serviceRegistrationStatus !== serviceRegistrationState.UNREGISTERED
                     }