diff --git a/src/components/TableComponents.vue b/src/components/TableComponents.vue
index 6962624f..952e8237 100644
--- a/src/components/TableComponents.vue
+++ b/src/components/TableComponents.vue
@@ -28,7 +28,7 @@ defineEmits<{
   (e: 'edit', index: number): void;
   (e: 'delete', index: number): void;
   (e: 'toggleStatus', row: typeof props.rows): void;
-  (e: 'download', row: typeof props.rows): void;
+  (e: 'download', index: number): void;
 }>();
 </script>
 
@@ -63,16 +63,17 @@ defineEmits<{
         />
 
         <q-btn
-          v-if="buttomDownload"
+          v-if="buttomDownload && props.row.id !== undefined"
           icon="mdi-download-outline"
           size="sm"
           dense
           round
           flat
-          @click.stop="$emit('download', props.row)"
+          @click.stop="$emit('download', props.rowIndex)"
         />
 
         <KebabAction
+          hide-toggle
           :id-name="props.row.code"
           :status="props.row.status"
           @view="$emit('view', props.rowIndex)"