diff --git a/briar-core/src/net/sf/briar/plugins/modem/SenderOutputStream.java b/briar-core/src/net/sf/briar/plugins/modem/SenderOutputStream.java
index 3b42e4f7b94ffb647d764ab15c9e3e8a102cb889..bed178ca55e593408214bdcf4f0035873abf0fc9 100644
--- a/briar-core/src/net/sf/briar/plugins/modem/SenderOutputStream.java
+++ b/briar-core/src/net/sf/briar/plugins/modem/SenderOutputStream.java
@@ -18,6 +18,12 @@ class SenderOutputStream extends OutputStream {
 	@Override
 	public void close() throws IOException {
 		send(true);
+		try {
+			sender.flush();
+		} catch(InterruptedException e) {
+			Thread.currentThread().interrupt();
+			throw new IOException("Interrupted while closing");
+		}
 	}
 
 	@Override