diff --git a/wayback-core/src/main/java/org/archive/wayback/replay/JSPReplayRenderer.java b/wayback-core/src/main/java/org/archive/wayback/replay/JSPReplayRenderer.java
index e3d2c0317f..6edbda933e 100644
--- a/wayback-core/src/main/java/org/archive/wayback/replay/JSPReplayRenderer.java
+++ b/wayback-core/src/main/java/org/archive/wayback/replay/JSPReplayRenderer.java
@@ -79,7 +79,9 @@ public void renderResource(HttpServletRequest httpRequest,
 			Resource payloadResource, ResultURIConverter uriConverter,
 			CaptureSearchResults results) throws ServletException, IOException,
 			WaybackException {
+		final Resource resource = payloadResource == httpHeadersResource ? payloadResource
+				: new CompositeResource(httpHeadersResource, payloadResource);
 		renderResource(httpRequest, httpResponse, wbRequest, result,
-				payloadResource, uriConverter, results);
+				resource, uriConverter, results);
 	}
 }