diff --git a/web_server/blueprints/streams.py b/web_server/blueprints/streams.py
index 3696c67..2d36d30 100644
--- a/web_server/blueprints/streams.py
+++ b/web_server/blueprints/streams.py
@@ -274,6 +274,7 @@ def publish_stream():
     stream_key = data.get("stream_key")
     stream_title = data.get("title")
     stream_category = data.get("category_name")
+    stream_thumbnail = data.get("thumbnail")
 
     user_id = None
     username = None
@@ -327,6 +328,7 @@ def update_stream():
     stream_category = data.get("category_name")
     stream_thumbnail = data.get("thumbnail")
 
+
     with Database() as db:
         user_info = db.fetchone("""SELECT user_id, username, is_live 
                                 FROM users 
diff --git a/web_server/celery_tasks/streaming.py b/web_server/celery_tasks/streaming.py
index 37f276b..9808973 100644
--- a/web_server/celery_tasks/streaming.py
+++ b/web_server/celery_tasks/streaming.py
@@ -1,7 +1,7 @@
 from celery import Celery, shared_task, Task
 from datetime import datetime
 from celery_tasks.preferences import user_preferences
-from utils.stream_utils import generate_thumbnail, get_streamer_live_status, get_custom_thumbnail_status
+from utils.stream_utils import generate_thumbnail, get_streamer_live_status, get_custom_thumbnail_status, remove_hls_files
 from time import sleep
 from os import listdir, remove
 import subprocess
@@ -50,6 +50,9 @@ def combine_ts_stream(stream_path, vods_path, vod_file_name):
 
     subprocess.run(vod_command)
 
+    # Remove HLS files, even if user is not streaming
+    remove_hls_files(stream_path)
+
 @shared_task
 def convert_image_to_png(image_path, png_path):
     """
diff --git a/web_server/utils/stream_utils.py b/web_server/utils/stream_utils.py
index 5f9537a..e71b5e6 100644
--- a/web_server/utils/stream_utils.py
+++ b/web_server/utils/stream_utils.py
@@ -80,9 +80,6 @@ def end_user_stream(stream_key, user_id, username):
             stream_info = db.fetchone("""SELECT *
                                     FROM streams
                                     WHERE user_id = ?""", (user_id,))
-            
-            # Remove HLS files, even if user is not streaming
-            remove_hls_files(path_manager.get_stream_path(username))
                                     
             # If user is not streaming, just return
             if not stream_info: