diff --git a/src/mesa/drivers/dri/i965/gen7_urb.c b/src/mesa/drivers/dri/i965/gen7_urb.c
index a412a42..87c50c4 100644
--- a/src/mesa/drivers/dri/i965/gen7_urb.c
+++ b/src/mesa/drivers/dri/i965/gen7_urb.c
@@ -298,17 +298,21 @@ gen7_upload_urb(struct brw_context *brw)
       remaining_space -= vs_additional;
       total_wants -= vs_wants;
 
-      unsigned hs_additional = (unsigned)
-         round(hs_wants * (((double) remaining_space) / total_wants));
-      hs_chunks += hs_additional;
-      remaining_space -= hs_additional;
-      total_wants -= hs_wants;
-
-      unsigned ds_additional = (unsigned)
-         round(ds_wants * (((double) remaining_space) / total_wants));
-      ds_chunks += ds_additional;
-      remaining_space -= ds_additional;
-      total_wants -= ds_wants;
+      if(total_wants > 0) {
+          unsigned hs_additional = (unsigned)
+             round(hs_wants * (((double) remaining_space) / total_wants));
+          hs_chunks += hs_additional;
+          remaining_space -= hs_additional;
+          total_wants -= hs_wants;
+      }
+
+      if(total_wants > 0) {
+          unsigned ds_additional = (unsigned)
+             round(ds_wants * (((double) remaining_space) / total_wants));
+          ds_chunks += ds_additional;
+          remaining_space -= ds_additional;
+          total_wants -= ds_wants;
+      }
 
       gs_chunks += remaining_space;
    }