diff --git a/html/index.html b/html/index.html
index 6b49e41..c4759c7 100644
--- a/html/index.html
+++ b/html/index.html
@@ -160,7 +160,7 @@
                 let current_item = this.current_item;
                 let title = current_item.title.replace(/[\/\\\:]+/g, '_');
                 let author = current_item.author.replace(/[\/\\\:]+/g, '_');
-                return this.store_path_root + this.store_path.replaceAll("{title}", title).replaceAll("{author}", author) + '.' + this.current_item.extension;
+                return this.store_path_root + this.store_path.replaceAll("{title}", title).replaceAll("{author}", author) + (!!this.current_item.extension?'.' + this.current_item.extension : '');
             }
         },
         methods: {
@@ -254,6 +254,7 @@
                     });
                 }else {
                     this.handleStore();
+                    this.is_storing = false;
                 }
             },
             async handleCheckMusicExists() {