diff --git a/lib/Service/SynchronizationService.php b/lib/Service/SynchronizationService.php
index 920ec6e8..80d7069a 100644
--- a/lib/Service/SynchronizationService.php
+++ b/lib/Service/SynchronizationService.php
@@ -385,6 +385,10 @@ public function getAllObjectsFromApi(Synchronization $synchronization, ?bool $is
         // Make the initial API call
         $response = $this->callService->call(source: $source, endpoint: $endpoint, method: 'GET', config: $config)->getResponse();
         $body = json_decode($response['body'], true);
+        if (empty($body) === true) {
+            // @todo log that we got a empty response
+            return [];
+        }
         $objects = array_merge($objects, $this->getAllObjectsFromArray(array: $body, synchronization: $synchronization));
 
         // Return a single object or empty array if in test mode
diff --git a/src/modals/Modals.vue b/src/modals/Modals.vue
index fa2ad596..693ef517 100644
--- a/src/modals/Modals.vue
+++ b/src/modals/Modals.vue
@@ -27,7 +27,7 @@ import { navigationStore } from '../store/store.js'
 		<DeleteMappingUnset v-if="navigationStore.modal === 'deleteMappingUnset'" />
 		<DeleteSynchronization />
 		<EditSynchronization v-if="navigationStore.modal === 'editSynchronization'" />
-		<TestSynchronization />
+		<TestSynchronization v-if="navigationStore.modal === 'testSynchronization'" />
 		<EditJobArgument />
 		<DeleteJobArgument />
 		<EditSourceConfiguration />
diff --git a/src/modals/Synchronization/TestSynchronization.vue b/src/modals/Synchronization/TestSynchronization.vue
index d9694105..7e83dde4 100644
--- a/src/modals/Synchronization/TestSynchronization.vue
+++ b/src/modals/Synchronization/TestSynchronization.vue
@@ -3,8 +3,7 @@ import { synchronizationStore, navigationStore } from '../../store/store.js'
 </script>
 
 <template>
-	<NcModal v-if="navigationStore.modal === 'testSynchronization'"
-		ref="modalRef"
+	<NcModal ref="modalRef"
 		label-id="testSynchronization"
 		@close="closeModal">
 		<div class="modalContent">
@@ -14,30 +13,36 @@ import { synchronizationStore, navigationStore } from '../../store/store.js'
 				<NcLoadingIcon :size="64" name="Running synchronization test" />
 			</div>
 
-			<NcNoteCard v-if="response?.ok" type="success">
-				<p>The connection to the synchronization was successful.</p>
+			<NcNoteCard v-if="success === false" type="error">
+				<p>An error occurred while testing the synchronization.</p>
 			</NcNoteCard>
-			<NcNoteCard v-if="!response?.ok || error" type="error">
-				<p>
-					An error occurred while testing the connection: {{
-						synchronizationStore.synchronizationTest
-							? synchronizationStore.synchronizationTest.message
+
+			<div v-if="success !== null">
+				<NcNoteCard v-if="response?.ok" type="success">
+					<p>The connection to the synchronization was successful.</p>
+				</NcNoteCard>
+				<NcNoteCard v-if="!response?.ok || error" type="error">
+					<p>
+						An error occurred while testing the connection: {{
+							synchronizationStore.synchronizationTest
 								? synchronizationStore.synchronizationTest.message
-								: synchronizationStore.synchronizationTest.error
-							: response?.statusMessage
-								? response?.statusMessage
-								: `${response?.status} - ${response?.statusText}`
-					}}
-				</p>
-			</NcNoteCard>
+									? synchronizationStore.synchronizationTest.message
+									: synchronizationStore.synchronizationTest.error
+								: response?.statusMessage
+									? response?.statusMessage
+									: `${response?.status} - ${response?.statusText}`
+						}}
+					</p>
+				</NcNoteCard>
 
-			<div v-if="response">
-				<p><b>Status:</b> {{ response?.statusText }} ({{ response?.status }})</p>
-				<p><b>Response time:</b> {{ response?.responseTime ?? 'Onbekend' }} (Milliseconds)</p>
-				<p><b>Size:</b> {{ response?.size ?? 'Onbekend' }} (Bytes)</p>
-				<p><b>Remote IP:</b> {{ response?.remoteIp }}</p>
-				<p><b>Headers:</b> {{ response?.headers }}</p>
-				<p><b>Body:</b> {{ response?.body }}</p>
+				<div v-if="response">
+					<p><b>Status:</b> {{ response?.statusText }} ({{ response?.status }})</p>
+					<p><b>Response time:</b> {{ response?.responseTime ?? 'Onbekend' }} (Milliseconds)</p>
+					<p><b>Size:</b> {{ response?.size ?? 'Onbekend' }} (Bytes)</p>
+					<p><b>Remote IP:</b> {{ response?.remoteIp ?? 'Onbekend' }}</p>
+					<p><b>Headers:</b> {{ response?.headers }}</p>
+					<p><b>Body:</b> {{ response?.body }}</p>
+				</div>
 			</div>
 		</div>
 	</NcModal>
@@ -59,39 +64,29 @@ export default {
 	},
 	data() {
 		return {
+			response: null,
 			success: null,
 			loading: false,
 			error: false,
-			updated: false,
-			response: null,
 		}
 	},
-	updated() {
-		if (navigationStore.modal === 'testSynchronization' && !this.updated) {
-			this.testSynchronization()
-			this.updated = true
-		}
+	mounted() {
+		this.testSynchronization()
 	},
 	methods: {
 		closeModal() {
 			navigationStore.setModal(false)
 			synchronizationStore.synchronizationTest = null
-			this.success = null
-			this.loading = false
-			this.error = false
-			this.updated = false
 		},
 		async testSynchronization() {
+			this.success = null
 			this.loading = true
+			this.error = false
 
 			synchronizationStore.testSynchronization()
 				.then(({ response }) => {
-
 					this.response = response
-
 					this.success = response.ok
-					this.error = false
-					response.ok && this.closeModal()
 				}).catch((error) => {
 					this.success = false
 					this.error = error.message || 'An error occurred while testing the synchronization'