diff --git a/hphp/runtime/base/server/upload.cpp b/hphp/runtime/base/server/upload.cpp
index d6a60bb73..da53c9b1a 100644
--- a/hphp/runtime/base/server/upload.cpp
+++ b/hphp/runtime/base/server/upload.cpp
@@ -995,7 +995,7 @@ void rfc1867PostHandler(Transport *transport,
         }
       }
 
-      if (cancel_upload) {
+      if (cancel_upload && cancel_upload != UPLOAD_ERROR_C) {
         if (temp_filename) {
           if (cancel_upload != UPLOAD_ERROR_E) { /* file creation failed */
             unlink(temp_filename);
@@ -1075,7 +1075,7 @@ void rfc1867PostHandler(Transport *transport,
       s = nullptr;
 
       /* Possible Content-Type: */
-      if (cancel_upload ||
+      if ((cancel_upload && cancel_upload != UPLOAD_ERROR_C) ||
           !(cd = php_mime_get_hdr_value(header, "Content-Type"))) {
         cd = "";
       } else {