diff --git a/tools/skiaserve/skiaserve.cpp b/tools/skiaserve/skiaserve.cpp
index 6b93429..409809b 100644
--- a/tools/skiaserve/skiaserve.cpp
+++ b/tools/skiaserve/skiaserve.cpp
@@ -210,6 +210,7 @@
             SkData* data = request->fPNG.get();
             return SendData(connection, data, "image/png");
         }
+
         return MHD_NO;
     }
 };
@@ -257,6 +258,10 @@
             return MHD_YES;
         }
 
+        // clear upload context
+        delete request->fUploadContext;
+        request->fUploadContext = nullptr;
+
         return SendTemplate(connection, true, "/");
     }
 };