diff --git a/firmware/application/apps/ui_playlist.cpp b/firmware/application/apps/ui_playlist.cpp
index 951877e5a..835cf5b45 100644
--- a/firmware/application/apps/ui_playlist.cpp
+++ b/firmware/application/apps/ui_playlist.cpp
@@ -62,6 +62,7 @@ void PlaylistView::set_ready() {
 				txtline_process(line); 
 			}
 		}
+		playlist_masterdb = playlist_db;
 		return ;
 		}
 
@@ -215,6 +216,9 @@ void PlaylistView::stop(const bool do_loop) {
 	if (do_loop) {
 		if (playlist_db.size() > 0 ) {
 			start();
+		} else {
+			playlist_db = playlist_masterdb;
+			start();
 		}
 	} else {
 		radio::set_antenna_bias(false);    //Turn off Bias Tee
diff --git a/firmware/application/apps/ui_playlist.hpp b/firmware/application/apps/ui_playlist.hpp
index 399a8c6cb..228a0a505 100644
--- a/firmware/application/apps/ui_playlist.hpp
+++ b/firmware/application/apps/ui_playlist.hpp
@@ -57,6 +57,7 @@ private:
 		uint32_t next_delay{};
 	};
 	std::deque<playlist_entry> playlist_db{};
+	std::deque<playlist_entry> playlist_masterdb{};
 	uint32_t sample_rate = 0;
 	int32_t tx_gain { 47 };
 	bool rf_amp { true }; // aux private var to store temporal, Replay App rf_amp user selection.