diff --git a/frontend/src/components/forms/M3U.jsx b/frontend/src/components/forms/M3U.jsx
index 33c0aab9..276c6f63 100644
--- a/frontend/src/components/forms/M3U.jsx
+++ b/frontend/src/components/forms/M3U.jsx
@@ -199,6 +199,11 @@ const M3U = ({
 
   const closeGroupFilter = () => {
     setGroupFilterModalOpen(false);
+    // After group filter setup for a new account, reset everything
+    form.reset();
+    setFile(null);
+    setPlaylist(null);
+    onClose();
   };
 
   const closeFilter = () => {
diff --git a/frontend/src/components/tables/M3UsTable.jsx b/frontend/src/components/tables/M3UsTable.jsx
index e81a9e27..64b401d8 100644
--- a/frontend/src/components/tables/M3UsTable.jsx
+++ b/frontend/src/components/tables/M3UsTable.jsx
@@ -355,9 +355,7 @@ const M3UTable = () => {
   };
 
   const editPlaylist = async (playlist = null) => {
-    if (playlist) {
-      setPlaylist(playlist);
-    }
+    setPlaylist(playlist);
     setPlaylistModalOpen(true);
   };