diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PelotonComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PelotonComponent.vue
index 9cc2f75b5..13bf284f5 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PelotonComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PelotonComponent.vue
@@ -18,7 +18,7 @@
         <select
           v-model="selectedStoredObject"
           class="form-select"
-          @change="onSelectionChange"
+          @change="fetchDocument"
           style="max-width: 400px"
         >
           <option
@@ -125,22 +125,7 @@ const isLoading = ref<boolean>(false);
 const error = ref<string>("");
 const showPelotonsModal = ref<boolean>(false);
 
-watch(
-  () => props.storedObjects,
-  (newStoredObjects) => {
-    if (
-      newStoredObjects &&
-      newStoredObjects.length > 0 &&
-      !selectedStoredObject.value
-    ) {
-      selectedStoredObject.value = newStoredObjects[0];
-      onSelectionChange();
-    }
-  },
-  { immediate: true },
-);
-
-async function onSelectionChange() {
+async function fetchDocument() {
   if (!selectedStoredObject.value) {
     cleanupPrevious();
     documentType.value = "";
@@ -162,7 +147,6 @@ async function onSelectionChange() {
       selectedStoredObject.value,
       selectedStoredObject.value.currentVersion,
     );
-    console.log("downloadInfo", downloadInfo);
     const rawResponse = await window.fetch(downloadInfo.url);
 
     if (!rawResponse.ok) {
@@ -228,22 +212,22 @@ function cleanupPrevious() {
     documentUrl.value = "";
   }
 }
-
 function handleClick() {
+  fetchDocument();
   showPelotonsModal.value = true;
-  if (
-    !selectedStoredObject.value &&
-    props.storedObjects &&
-    props.storedObjects.length > 0
-  ) {
-    selectedStoredObject.value = props.storedObjects[0];
-    onSelectionChange();
-  }
 }
 
 function closeModal() {
   showPelotonsModal.value = false;
 }
+
+watch(
+  () => props.storedObjects,
+  (newStoredObjects) => {
+    selectedStoredObject.value = newStoredObjects ? newStoredObjects[0] : null;
+  },
+  { immediate: true },
+);
 </script>
 
 <style lang="scss" scoped>