diff --git a/playlist.go b/playlist.go
index 9fed006..33ea4e8 100644
--- a/playlist.go
+++ b/playlist.go
@@ -75,7 +75,12 @@ func NewPlaylist(user, id string) (*Playlist, error) {
 			playlist:     playlist,
 			dontSkip:     false,
 		}
-		dj.queue.AddSong(newSong)
+		// Don't spam the chat if a playlist contains songs that are too long
+		if dj.conf.General.MaxSongDuration == 0 {
+			dj.queue.AddSong(newSong)
+		} else if duration <= dj.conf.General.MaxSongDuration {
+			dj.queue.AddSong(newSong)
+		}
 	}
 
 	return playlist, nil