diff --git a/app.py b/app.py
index f90bfb9..9e4b1aa 100644
--- a/app.py
+++ b/app.py
@@ -54,6 +54,9 @@
 
 @app.route('/media-list/clear-cache')
 def media_list_clear_cache():
+    if GStorage["scaning_state"] == "inprogress":
+        return jsonify({"status": True})
+        
     media_remove_cache(config["cache_dir"], GStorage)
     scan_medialib(config, GStorage, socketio)
     return jsonify({"status": True})
diff --git a/static/js/components/media-list.js b/static/js/components/media-list.js
index 58dfc87..ba880df 100644
--- a/static/js/components/media-list.js
+++ b/static/js/components/media-list.js
@@ -122,6 +122,7 @@
 	socket.on("medialib-scaning-complete", resp => {
 		if($('#media-table_wrapper').length) {
 			$('#media-table').DataTable().destroy();
+			$("#media-table tbody").empty();
 		}
 
 		renderMediaList(resp.data);