diff --git a/src/interfaces.ts b/src/interfaces.ts
index 877814b..eb606c0 100644
--- a/src/interfaces.ts
+++ b/src/interfaces.ts
@@ -3,6 +3,7 @@ export interface Room {
   magnet: string;
   createdAt: Date;
   movie?: string;
+  filename?: string;
   downloaded?: boolean;
   downloadedAt?: Date;
   position: number;
diff --git a/src/views/Room/Index.vue b/src/views/Room/Index.vue
index 2347457..55b7047 100644
--- a/src/views/Room/Index.vue
+++ b/src/views/Room/Index.vue
@@ -12,12 +12,12 @@
     <video
       v-if="room.downloaded"
       controls
-      :src="movieUrl"
       ref="video"
       @seeked="seeked"
       @play="playing = true"
       @pause="playing = false"
     >
+      <source :src="movieUrl" type="video/mp4">
     </video>
   </div>
 </template>
@@ -55,7 +55,7 @@ export default defineComponent({
   },
   computed: {
     movieUrl() {
-      return `${process.env.VUE_APP_MOVIES}?id=${this.room.id}`;
+      return `${process.env.VUE_APP_MOVIES}?filename=${this.room.filename}`;
     },
     progressPerc() {
       return Math.floor(this.progress * 100);
@@ -68,7 +68,7 @@ export default defineComponent({
       this.progressInterval = setInterval(async () => {
         const result = await getStatus(this.id);
         this.progress = result.progress;
-        if (result.downloaded) {
+        if (result.downloaded || this.progress === 1) {
           this.room.downloaded = true;
           clearInterval(this.progressInterval);
         }