diff --git a/pkg/server/music.go b/pkg/server/music.go
index fb05a6a..612a9b4 100644
--- a/pkg/server/music.go
+++ b/pkg/server/music.go
@@ -39,16 +39,29 @@ func AddLatestToQue() {
 }
 
 func AddLatestPlayed() {
-	if lastFetched.Path != "" {
-		db.AddGamePlayed(lastFetched.GameId)
+	if len(songQue) == 0 {
+		return
 	}
+	var currentSongData = songQue[currentSong]
+
+	db.AddGamePlayed(currentSongData.GameId)
+	db.AddSongPlayed(currentSongData.GameId, currentSongData.SongName)
+}
+
+func SetPlayed(songNumber int) {
+	if len(songQue) == 0 || songNumber >= len(songQue) {
+		return
+	}
+	var songData = songQue[songNumber]
+	db.AddGamePlayed(songData.GameId)
+	db.AddSongPlayed(songData.GameId, songData.SongName)
 }
 
 func GetRandomSong() string {
-	if games == nil || len(games) == 0 {
+	if len(games) == 0 {
 		games = db.FindAllGames()
 	}
-	if games == nil || len(games) == 0 {
+	if len(games) == 0 {
 		return ""
 	}
 
@@ -58,7 +71,7 @@ func GetRandomSong() string {
 }
 
 func GetRandomSongLowChance() string {
-	if games == nil || len(games) == 0 {
+	if len(games) == 0 {
 		games = db.FindAllGames()
 	}
 
@@ -194,15 +207,6 @@ func GetAllGamesRandom() []string {
 	return jsonArray
 }
 
-func SetPlayed(songNumber int) {
-	if songQue == nil || len(songQue) == 0 || songNumber >= len(songQue) {
-		return
-	}
-	var songData = songQue[songNumber]
-	db.AddGamePlayed(songData.GameId)
-	db.AddSongPlayed(songData.GameId, songData.SongName)
-}
-
 func GetNextSong() string {
 	if songQue == nil {
 		return ""