diff --git a/src/EventStore.js b/src/EventStore.js
index <HASH>..<HASH> 100644
--- a/src/EventStore.js
+++ b/src/EventStore.js
@@ -99,7 +99,9 @@ function augmentEvents(events, sourceCommand = {}, eventStoreConfig) {
 	const extension = {
 		sagaId,
 		sagaVersion,
-		context: Object.assign({ hostname }, context)
+		context: hostname ?
+			Object.assign({ hostname }, context) :
+			context
 	};
 
 	return events.map(event => Object.assign({}, extension, event));
- don't create empty context without hostname