diff --git a/packages/ui-components/src/__tests__/transactionStore.test.ts b/packages/ui-components/src/__tests__/transactionStore.test.ts
index 7fd5e29c6..9ae497f95 100644
--- a/packages/ui-components/src/__tests__/transactionStore.test.ts
+++ b/packages/ui-components/src/__tests__/transactionStore.test.ts
@@ -247,8 +247,12 @@ describe('transactionStore', () => {
 
 		(getTransaction as Mock).mockResolvedValue({ id: mockTxHash });
 
+		vi.useFakeTimers({ shouldAdvanceTime: true });
+
 		await awaitTransactionIndexing(mockSubgraphUrl, mockTxHash, mockSuccessMessage);
 
+		vi.runOnlyPendingTimers();
+
 		await waitFor(() => {
 			expect(get(transactionStore).status).toBe(TransactionStatus.SUCCESS);
 			expect(get(transactionStore).message).toBe(mockSuccessMessage);
@@ -264,7 +268,11 @@ describe('transactionStore', () => {
 
 		(getTransaction as Mock).mockResolvedValue(null);
 
-		const indexingPromise = awaitTransactionIndexing(mockSubgraphUrl, mockTxHash, mockSuccessMessage);
+		const indexingPromise = awaitTransactionIndexing(
+			mockSubgraphUrl,
+			mockTxHash,
+			mockSuccessMessage
+		);
 
 		expect(get(transactionStore).status).toBe(TransactionStatus.PENDING_SUBGRAPH);
 		expect(get(transactionStore).message).toBe('Checking for transaction indexing...');
diff --git a/packages/ui-components/src/lib/stores/transactionStore.ts b/packages/ui-components/src/lib/stores/transactionStore.ts
index 4a188c72f..d65014f3b 100644
--- a/packages/ui-components/src/lib/stores/transactionStore.ts
+++ b/packages/ui-components/src/lib/stores/transactionStore.ts
@@ -130,7 +130,6 @@ const transactionStore = () => {
 			if (newTx) {
 				clearInterval(interval);
 				transactionSuccess(txHash, successMessage);
-
 			} else if (attempts >= 10) {
 				update((state) => ({
 					...state,