diff --git a/src/audio/output/AudioOutput.java b/src/audio/output/AudioOutput.java
index 3b0abed8..338d3479 100644
--- a/src/audio/output/AudioOutput.java
+++ b/src/audio/output/AudioOutput.java
@@ -27,7 +27,7 @@ public abstract class AudioOutput implements Listener<AudioPacket>
 	protected LinkedTransferQueue<AudioPacket> mBuffer = new LinkedTransferQueue<>();
 	protected ScheduledExecutorService mExecutorService;
 	protected boolean mCanProcessAudio;
-	protected long mLastBufferReceived;
+	protected long mLastActivity;
 
 	public void dispose()
 	{
@@ -111,7 +111,7 @@ public abstract class AudioOutput implements Listener<AudioPacket>
 	 */
 	public long getLastBufferReceived()
 	{
-		return mLastBufferReceived;
+		return mLastActivity;
 	}
 
 	@Override
@@ -119,7 +119,7 @@ public abstract class AudioOutput implements Listener<AudioPacket>
 	{
 		if( mCanProcessAudio )
 		{
-			mLastBufferReceived = System.currentTimeMillis();
+			mLastActivity = System.currentTimeMillis();
 			
 			mBuffer.add( packet );
 		}
diff --git a/src/audio/output/MonoAudioOutput.java b/src/audio/output/MonoAudioOutput.java
index 0f4d2674..6495f753 100644
--- a/src/audio/output/MonoAudioOutput.java
+++ b/src/audio/output/MonoAudioOutput.java
@@ -165,6 +165,8 @@ public class MonoAudioOutput extends AudioOutput
 								checkStart();
 								
 								broadcast( packet.getAudioMetadata() );
+
+								mLastActivity = System.currentTimeMillis();
 							}
 						}
 					}
diff --git a/src/audio/output/StereoAudioOutput.java b/src/audio/output/StereoAudioOutput.java
index db54e80f..15dc8e07 100644
--- a/src/audio/output/StereoAudioOutput.java
+++ b/src/audio/output/StereoAudioOutput.java
@@ -190,6 +190,8 @@ public class StereoAudioOutput extends AudioOutput
 								checkStart();
 								
 								broadcast( packet.getAudioMetadata() );
+								
+								mLastActivity = System.currentTimeMillis();
 							}
 						}
 					}