diff --git a/api/helpers.go b/api/helpers.go
index 89e4d75..75bd68e 100644
--- a/api/helpers.go
+++ b/api/helpers.go
@@ -11,11 +11,11 @@ import (
 func getNextSong() (Track, error) {
 	var nextTrack Track
 	var err error
-	// if voteToSkipEnabled {
-	// 	nextTrack, err = getNextSongRandom()
-	// } else {
+	if voteToSkipEnabled {
+		nextTrack, err = getNextSongRandom()
+	} else {
 	nextTrack, err = getNextSongByVotes()
-	// }
+	}
 	if err != nil {
 		// Assume no record - get from fallback playlist
 		nextTrack = assignFallback(nextTrack)
@@ -40,7 +40,7 @@ func getNextSongExcludeURI(excludeUri spotify.URI) (Track, error) {
 
 func getNextSongRandom() (Track, error) {
 	var track Track
-	if err := db.Raw("SELECT * FROM tracks ORDER BY RAND()").First(&track).Error; err != nil {
+	if err := db.Raw("SELECT * FROM tracks ORDER BY random()").First(&track).Error; err != nil {
 		return track, err
 	}
 	return track, nil