diff --git a/source/org/jivesoftware/smack/PacketWriter.java b/source/org/jivesoftware/smack/PacketWriter.java
index 8213bbd35..155110cfb 100644
--- a/source/org/jivesoftware/smack/PacketWriter.java
+++ b/source/org/jivesoftware/smack/PacketWriter.java
@@ -193,9 +193,11 @@ class PacketWriter {
                 if (packet != null) {
                     synchronized (writer) {
                         writer.write(packet.toXML());
-                        writer.flush();
-                        // Keep track of the last time a stanza was sent to the server
-                        lastActive = System.currentTimeMillis();
+                        if (queue.isEmpty()) {
+                            writer.flush();
+                            // Keep track of the last time a stanza was sent to the server
+                            lastActive = System.currentTimeMillis();
+                        }
                     }
                 }
             }