diff --git a/src/shapes/bsplinecurve.cpp b/src/shapes/bsplinecurve.cpp
index d9175db08..03e6ed69e 100644
--- a/src/shapes/bsplinecurve.cpp
+++ b/src/shapes/bsplinecurve.cpp
@@ -28,7 +28,7 @@ B-spline curve (:monosp:`bsplinecurve`)
 -------------------------------------------------
 
 .. pluginparameters::
- :extra-rows: 2
+ :extra-rows: 3
 
  * - filename
    - |string|
@@ -39,6 +39,11 @@ B-spline curve (:monosp:`bsplinecurve`)
    - Specifies a linear object-to-world transformation. Note that the control
      points' raddii are invariant to this transformation!
 
+ * - silhouette_sampling_weight
+   - |float|
+   - Weight associated with this shape when sampling silhoeuttes in the scene. (Default: 1)
+   - |exposed|
+
  * - control_point_count
    - |int|
    - Total number of control points
diff --git a/src/shapes/cylinder.cpp b/src/shapes/cylinder.cpp
index 4a5a50f82..58a1f2692 100644
--- a/src/shapes/cylinder.cpp
+++ b/src/shapes/cylinder.cpp
@@ -50,6 +50,11 @@ Cylinder (:monosp:`cylinder`)
      not permitted! (Default: none, i.e. object space = world space)
    - |exposed|, |differentiable|, |discontinuous|
 
+ * - silhouette_sampling_weight
+   - |float|
+   - Weight associated with this shape when sampling silhoeuttes in the scene. (Default: 1)
+   - |exposed|
+
 .. subfigstart::
 .. subfigure:: ../../resources/data/docs/images/render/shape_cylinder_onesided.jpg
    :caption: Cylinder with the default one-sided shading
diff --git a/src/shapes/disk.cpp b/src/shapes/disk.cpp
index 1cba5b7bd..52615a670 100644
--- a/src/shapes/disk.cpp
+++ b/src/shapes/disk.cpp
@@ -34,6 +34,11 @@ Disk (:monosp:`disk`)
      permitted! (Default: none, i.e. object space = world space)
    - |exposed|, |differentiable|, |discontinuous|
 
+ * - silhouette_sampling_weight
+   - |float|
+   - Weight associated with this shape when sampling silhoeuttes in the scene. (Default: 1)
+   - |exposed|
+
 .. subfigstart::
 .. subfigure:: ../../resources/data/docs/images/render/shape_disk.jpg
    :caption: Basic example
diff --git a/src/shapes/rectangle.cpp b/src/shapes/rectangle.cpp
index 83e888259..ed71da525 100644
--- a/src/shapes/rectangle.cpp
+++ b/src/shapes/rectangle.cpp
@@ -33,6 +33,11 @@ Rectangle (:monosp:`rectangle`)
    - Specifies a linear object-to-world transformation. (Default: none (i.e. object space = world space))
    - |exposed|, |differentiable|, |discontinuous|
 
+ * - silhouette_sampling_weight
+   - |float|
+   - Weight associated with this shape when sampling silhoeuttes in the scene. (Default: 1)
+   - |exposed|
+
 .. subfigstart::
 .. subfigure:: ../../resources/data/docs/images/render/shape_rectangle.jpg
    :caption: Basic example
diff --git a/src/shapes/sdfgrid.cpp b/src/shapes/sdfgrid.cpp
index 9d0ee05e8..43511e46b 100644
--- a/src/shapes/sdfgrid.cpp
+++ b/src/shapes/sdfgrid.cpp
@@ -237,8 +237,8 @@ class SDFGrid final : public Shape<Float, Spectrum> {
 
     void traverse(TraversalCallback *callback) override {
         Base::traverse(callback);
-        callback->put_parameter("to_world",     *m_to_world.ptr(),          ParamFlags::Differentiable | ParamFlags::Discontinuous);
-        callback->put_parameter("grid",         m_grid_texture.tensor(),    ParamFlags::Differentiable | ParamFlags::Discontinuous);
+        callback->put_parameter("to_world",     *m_to_world.ptr(),          +ParamFlags::NonDifferentiable);
+        callback->put_parameter("grid",         m_grid_texture.tensor(),    +ParamFlags::NonDifferentiable);
         callback->put_parameter("watertight",   m_watertight,               +ParamFlags::NonDifferentiable);
     }
 
diff --git a/src/shapes/sphere.cpp b/src/shapes/sphere.cpp
index 2cb13d256..8c5abde57 100644
--- a/src/shapes/sphere.cpp
+++ b/src/shapes/sphere.cpp
@@ -43,6 +43,11 @@ Sphere (:monosp:`sphere`)
       (Default: none, i.e. object space = world space)
    - |exposed|, |differentiable|, |discontinuous|
 
+ * - silhouette_sampling_weight
+   - |float|
+   - Weight associated with this shape when sampling silhoeuttes in the scene. (Default: 1)
+   - |exposed|
+
 .. subfigstart::
 .. subfigure:: ../../resources/data/docs/images/render/shape_sphere_basic.jpg
    :caption: Basic example