diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java
index 077c6a1e9..e712cd1ca 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java
@@ -88,7 +88,7 @@ class ConnectionManager {
         // As of 0.9.1, listen on configured port (default 0 = all)
         int protocol = defaultOptions.getEnforceProtocol() ? I2PSession.PROTO_STREAMING : I2PSession.PROTO_ANY;
         _session.addMuxedSessionListener(_messageHandler, protocol, defaultOptions.getLocalPort());
-        _outboundQueue = new PacketQueue(_context, _session);
+        _outboundQueue = new PacketQueue(_context);
         _recentlyClosed = new LHMCache<Long, Object>(32);
         /** Socket timeout for accept() */
         _soTimeout = -1;
@@ -893,7 +893,7 @@ class ConnectionManager {
     }
 
     /**
-     *  @since 0.9.20
+     *  @since 0.9.21
      */
     @Override
     public String toString() {
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketQueue.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketQueue.java
index 2039e5268..073ce3d15 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketQueue.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketQueue.java
@@ -28,7 +28,6 @@ import net.i2p.util.SimpleTimer2;
 class PacketQueue implements SendMessageStatusListener {
     private final I2PAppContext _context;
     private final Log _log;
-    private final I2PSession _session;
     private final ByteCache _cache = ByteCache.getInstance(64, 36*1024);
     private final Map<Long, Connection> _messageStatusMap;
     private volatile boolean _dead;
@@ -45,9 +44,8 @@ class PacketQueue implements SendMessageStatusListener {
     private static final long REMOVE_EXPIRED_TIME = 67*1000;
     private static final boolean ENABLE_STATUS_LISTEN = true;
 
-    public PacketQueue(I2PAppContext context, I2PSession session) {
+    public PacketQueue(I2PAppContext context) {
         _context = context;
-        _session = session;
         _log = context.logManager().getLog(PacketQueue.class);
         _messageStatusMap = new ConcurrentHashMap<Long, Connection>(16);
         new RemoveExpired();
@@ -153,14 +151,15 @@ class PacketQueue implements SendMessageStatusListener {
                     options.setTagThreshold(thresh);
                 }
             }
+            I2PSession session = packet.getSession();
             if (listenForStatus) {
-                long id = _session.sendMessage(packet.getTo(), buf, 0, size,
+                long id = session.sendMessage(packet.getTo(), buf, 0, size,
                                  I2PSession.PROTO_STREAMING, packet.getLocalPort(), packet.getRemotePort(),
                                  options, this);
                 _messageStatusMap.put(Long.valueOf(id), packet.getConnection());
                 sent = true;
             } else {
-                sent = _session.sendMessage(packet.getTo(), buf, 0, size,
+                sent = session.sendMessage(packet.getTo(), buf, 0, size,
                                  I2PSession.PROTO_STREAMING, packet.getLocalPort(), packet.getRemotePort(),
                                  options);
             }