diff --git a/main/rfc1867.c b/main/rfc1867.c
index 60dfc2fe78c..3d54f2a7230 100644
--- a/main/rfc1867.c
+++ b/main/rfc1867.c
@@ -813,13 +813,7 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler)
 
 			/* If file_uploads=off, skip the file part */
 			if (!PG(file_uploads)) {
-				if (filename) {
-					efree(filename);
-				}
-				if (param) {
-					efree(param);
-				}
-				continue;
+				skip_upload = 1;
 			}
 
 			/* Return with an error if the posted data is garbled */