diff --git a/ext/phar/zip.c b/ext/phar/zip.c
index e8ffecec5714..8af57ea4a49f 100644
--- a/ext/phar/zip.c
+++ b/ext/phar/zip.c
@@ -1395,8 +1395,8 @@ ZEND_ATTRIBUTE_NONNULL_ARGS(1, 4) void phar_zip_flush(phar_archive_data *phar, z
 	zend_hash_apply_with_argument(&phar->manifest, phar_zip_changed_apply, (void *) &pass);
 
 	phar_metadata_tracker_try_ensure_has_serialized_data(&phar->metadata_tracker, phar->is_persistent);
-	if (pass_error) {
-has_pass_error:
+	if (pass_error
+	 || FAILURE == phar_zip_applysignature(phar, &pass)) {
 		spprintf(error, 4096, "phar zip flush of \"%s\" failed: %s", phar->fname, pass_error);
 		efree(pass_error);
 nopasserror:
@@ -1409,11 +1409,6 @@ ZEND_ATTRIBUTE_NONNULL_ARGS(1, 4) void phar_zip_flush(phar_archive_data *phar, z
 		return;
 	}
 
-	if (FAILURE == phar_zip_applysignature(phar, &pass)) {
-		ZEND_ASSERT(pass_error != NULL);
-		goto has_pass_error;
-	}
-
 	/* save zip */
 	cdir_size = php_stream_tell(pass.centralfp);
 	cdir_offset = php_stream_tell(pass.filefp);