diff --git a/classes/Player.js b/classes/Player.js
index 055bed4..75eb501 100644
--- a/classes/Player.js
+++ b/classes/Player.js
@@ -6,11 +6,11 @@ class Player extends EventEmitter {
 
     constructor() {
         super();
-        this.events = [];
     }
 
     async prepare(stream, settings) {
         logger.debug('preparing audio player...');
+        this.events = [];
         this.settings = settings;
         this.audiobuffer = new AudioBuffer(stream, this.settings);
         this.audiobuffer.on(constants.THRESHOLD, () => {
@@ -64,11 +64,14 @@ class Player extends EventEmitter {
     }
 
     #setState(state, data) {
+        if (this.state === state) {
+            return;
+        }
         this.state = state;
         logger.debug('setting state of audio player to \'' + state + '\'...');
-        // if (this.events.includes(state)) {
-            // return;
-        // }
+        if (this.events.includes(state)) {
+            return;
+        }
         logger.debug('emitting state \'' + state + '\' of audio player...');
         this.emit(this.state, { data: data });
         this.emit(constants.STATECHANGE, { state: this.state, progress: this.getProgress() });