diff --git a/src/main/java/io/github/dsheirer/sample/buffer/AbstractReusableBufferQueue.java b/src/main/java/io/github/dsheirer/sample/buffer/AbstractReusableBufferQueue.java
index 94810ec9..2f5d38b3 100644
--- a/src/main/java/io/github/dsheirer/sample/buffer/AbstractReusableBufferQueue.java
+++ b/src/main/java/io/github/dsheirer/sample/buffer/AbstractReusableBufferQueue.java
@@ -29,7 +29,9 @@ public abstract class AbstractReusableBufferQueue<T extends AbstractReusableBuff
     private Queue<T> mReusableBufferQueue = new LinkedTransferQueue<>();
     private int mBufferCount = 0;
     private String mDebugName;
-    protected boolean mBufferCreationLoggingEnabled = true;
+
+    //Set to true to log when reusable buffers are created to monitor proper user count management
+    protected boolean mBufferCreationLoggingEnabled = false;
 
     /**
      * Base queue for managing reusable buffers.
diff --git a/src/main/java/io/github/dsheirer/sample/buffer/ReusableAudioPacketQueue.java b/src/main/java/io/github/dsheirer/sample/buffer/ReusableAudioPacketQueue.java
index f8723804..cb196fba 100644
--- a/src/main/java/io/github/dsheirer/sample/buffer/ReusableAudioPacketQueue.java
+++ b/src/main/java/io/github/dsheirer/sample/buffer/ReusableAudioPacketQueue.java
@@ -55,6 +55,9 @@ public class ReusableAudioPacketQueue extends AbstractReusableBufferQueue<Reusab
         return buffer;
     }
 
+    /**
+     * Provides an end-audio packet that will not contain any audio samples.
+     */
     public ReusableAudioPacket getEndAudioBuffer()
     {
         ReusableAudioPacket buffer = getRecycledBuffer();
@@ -62,13 +65,12 @@ public class ReusableAudioPacketQueue extends AbstractReusableBufferQueue<Reusab
         if(buffer == null)
         {
             buffer = new ReusableAudioPacket(this, 0);
-            incrementBufferCount();
-
             buffer.setDebugName("Owner:" + getDebugName());
-            mLog.debug("Buffer Created - Count:" + getBufferCount() + (getDebugName() != null ? " [" + getDebugName() + "]" : ""));
+            incrementBufferCount();
         }
 
         buffer.setType(ReusableAudioPacket.Type.END);
+        buffer.incrementUserCount();
 
         return buffer;
     }