diff --git a/src/Connections/Elasticsearch.Net.Connection.Thrift/ThriftConnection.cs b/src/Connections/Elasticsearch.Net.Connection.Thrift/ThriftConnection.cs
index 00ba240172e..ffca8619236 100644
--- a/src/Connections/Elasticsearch.Net.Connection.Thrift/ThriftConnection.cs
+++ b/src/Connections/Elasticsearch.Net.Connection.Thrift/ThriftConnection.cs
@@ -274,13 +274,13 @@ private ElasticsearchResponse<Stream> Execute(RestRequest restRequest, object de
 					if (result.Status == Status.OK || result.Status == Status.CREATED || result.Status == Status.ACCEPTED)
 					{
 						var response = ElasticsearchResponse<Stream>.Create(
-							this._connectionSettings, (int)result.Status, method, path, requestData, new MemoryStream(result.Body));
+							this._connectionSettings, (int)result.Status, method, path, requestData, new MemoryStream(result.Body ?? new byte[0]));
 						return response;
 					}
 					else
 					{
 						var response = ElasticsearchResponse<Stream>.Create(
-							this._connectionSettings, (int)result.Status, method, path, requestData, new MemoryStream(result.Body));
+							this._connectionSettings, (int)result.Status, method, path, requestData, new MemoryStream(result.Body ?? new byte[0]));
 						return response;
 					}
 				}
diff --git a/src/Tests/Nest.Tests.Integration/Connection/Thrift/ThiftBugReportTests.cs b/src/Tests/Nest.Tests.Integration/Connection/Thrift/ThiftBugReportTests.cs
index bfe544d9240..1e42ff0bfeb 100644
--- a/src/Tests/Nest.Tests.Integration/Connection/Thrift/ThiftBugReportTests.cs
+++ b/src/Tests/Nest.Tests.Integration/Connection/Thrift/ThiftBugReportTests.cs
@@ -26,5 +26,16 @@ public void IndexExistShouldNotThrowOn404()
 			unknownIndexResult.ConnectionStatus.HttpStatusCode.Should().Be(404);
 
 		}
+
+		[Test]
+		public void EmptyResponseShouldNotThrowError()
+		{
+			var isValidThriftConnection = this._thriftClient.RootNodeInfo().IsValid;
+			isValidThriftConnection.Should().BeTrue();
+
+			var result = this._thriftClient.Connection.HeadSync(ElasticsearchConfiguration.CreateBaseUri(9500));
+			result.Success.Should().BeTrue();
+			result.OriginalException.Should().BeNull();
+		}
 	}
 }