--- a/devtools/client/netmonitor/src/components/headers-panel.js
+++ b/devtools/client/netmonitor/src/components/headers-panel.js
@@ -153,24 +153,16 @@ const HeadersPanel = createClass({
         requestHeadersFromUploadStream: uploadHeaders,
         responseHeaders,
         status,
         statusText,
         urlDetails,
       },
     } = this.props;
 
-    if ((!requestHeaders || !requestHeaders.headers.length) &&
-        (!uploadHeaders || !uploadHeaders.headers.length) &&
-        (!responseHeaders || !responseHeaders.headers.length)) {
-      return div({ className: "empty-notice" },
-        HEADERS_EMPTY_TEXT
-      );
-    }
-
     let object = Object.assign({},
       this.getProperties(responseHeaders, RESPONSE_HEADERS),
       this.getProperties(requestHeaders, REQUEST_HEADERS),
       this.getProperties(uploadHeaders, REQUEST_HEADERS_FROM_UPLOAD),
     );
 
     let summaryUrl = urlDetails.unicodeUrl ?
       this.renderSummary(SUMMARY_URL, urlDetails.unicodeUrl) : null;
@@ -189,16 +181,24 @@ const HeadersPanel = createClass({
       if (fromCache) {
         code = "cached";
       } else if (fromServiceWorker) {
         code = "service worker";
       } else {
         code = status;
       }
 
+      if ((!requestHeaders || !requestHeaders.headers.length) &&
+        (!uploadHeaders || !uploadHeaders.headers.length) &&
+        (!responseHeaders || !responseHeaders.headers.length)) {
+        return div({ className: "empty-notice" },
+          HEADERS_EMPTY_TEXT
+        );
+      }
+
       let statusCodeDocURL = getHTTPStatusCodeURL(status.toString());
       let inputWidth = status.toString().length + statusText.length + 1;
       let toggleRawHeadersClassList = ["devtools-button"];
       if (this.state.rawHeadersOpened) {
         toggleRawHeadersClassList.push("checked");
       }
 
       summaryStatus = (