diff --git a/src/main/java/com/snowplowanalytics/snowplow/tracker/emitter/BatchEmitter.java b/src/main/java/com/snowplowanalytics/snowplow/tracker/emitter/BatchEmitter.java
index 3a069be6..be738b59 100644
--- a/src/main/java/com/snowplowanalytics/snowplow/tracker/emitter/BatchEmitter.java
+++ b/src/main/java/com/snowplowanalytics/snowplow/tracker/emitter/BatchEmitter.java
@@ -17,6 +17,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 // Google
 import com.google.common.base.Preconditions;
@@ -38,6 +39,8 @@ public class BatchEmitter extends AbstractEmitter implements Closeable {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(BatchEmitter.class);
 
+    private long closeTimeout = 5;
+
     public static abstract class Builder<T extends Builder<T>> extends AbstractEmitter.Builder<T> {
 
         private int bufferSize = 50; // Optional
@@ -163,5 +166,18 @@ private SelfDescribingJson getFinalPost(List<TrackerPayload> buffer) {
     @Override
     public void close() {
         flushBuffer();
+        if (executor != null) {
+            executor.shutdown();
+            try {
+                if (!executor.awaitTermination(closeTimeout, TimeUnit.SECONDS)) {
+                    executor.shutdownNow();
+                    if (!executor.awaitTermination(closeTimeout, TimeUnit.SECONDS))
+                        LOGGER.warn("Executor did not terminate");
+                }
+            } catch (InterruptedException ie) {
+                executor.shutdownNow();
+                Thread.currentThread().interrupt();
+            }
+        }
     }
 }