diff --git a/src/components/new-safe/create/steps/StatusStep/useSafeCreationEffects.ts b/src/components/new-safe/create/steps/StatusStep/useSafeCreationEffects.ts
index cdfbaf882d..0aef0c4a19 100644
--- a/src/components/new-safe/create/steps/StatusStep/useSafeCreationEffects.ts
+++ b/src/components/new-safe/create/steps/StatusStep/useSafeCreationEffects.ts
@@ -21,16 +21,16 @@ const useSafeCreationEffects = ({
 
   // Asynchronously wait for Safe creation
   useEffect(() => {
-    if (pendingSafe?.safeAddress) {
+    if (status === SafeCreationStatus.SUCCESS && pendingSafe?.safeAddress) {
       pollSafeInfo(chainId, pendingSafe.safeAddress)
         .then(() => setStatus(SafeCreationStatus.INDEXED))
         .catch(() => setStatus(SafeCreationStatus.INDEX_FAILED))
     }
-  }, [chainId, pendingSafe?.safeAddress, setStatus])
+  }, [chainId, pendingSafe?.safeAddress, status, setStatus])
 
   // Add Safe to Added Safes and add owner and safe names to Address Book
   useEffect(() => {
-    if (pendingSafe?.safeAddress && status === SafeCreationStatus.PROCESSING) {
+    if (status === SafeCreationStatus.SUCCESS && pendingSafe?.safeAddress) {
       dispatch(
         updateAddressBook(
           chainId,