diff --git a/source/blender/draw/engines/eevee/eevee_lightcache.c b/source/blender/draw/engines/eevee/eevee_lightcache.c
index 4904f34a00b..b515ea9c625 100644
--- a/source/blender/draw/engines/eevee/eevee_lightcache.c
+++ b/source/blender/draw/engines/eevee/eevee_lightcache.c
@@ -1058,6 +1058,7 @@ static void eevee_lightbake_render_grid_sample(void *ved, void *user_data)
 
   /* Disable specular lighting when rendering probes to avoid feedback loops (looks bad). */
   common_data->spec_toggle = false;
+  common_data->sss_toggle = false;
   common_data->prb_num_planar = 0;
   common_data->prb_num_render_cube = 0;
   common_data->ray_type = EEVEE_RAY_DIFFUSE;
@@ -1127,6 +1128,7 @@ static void eevee_lightbake_render_probe_sample(void *ved, void *user_data)
 
   /* Disable specular lighting when rendering probes to avoid feedback loops (looks bad). */
   common_data->spec_toggle = false;
+  common_data->sss_toggle = false;
   common_data->prb_num_planar = 0;
   common_data->prb_num_render_cube = 0;
   common_data->ray_type = EEVEE_RAY_GLOSSY;
diff --git a/source/blender/editors/interface/interface_button_group.c b/source/blender/editors/interface/interface_button_group.c
index 3d82b84399c..2d2da9a4d14 100644
--- a/source/blender/editors/interface/interface_button_group.c
+++ b/source/blender/editors/interface/interface_button_group.c
@@ -86,9 +86,6 @@ void ui_button_group_replace_but_ptr(uiBlock *block, const void *old_but_ptr, ui
       }
     }
   }
-
-  /* The button should be in a group, otherwise there are no button groups at all. */
-  BLI_assert(BLI_listbase_is_empty(&block->button_groups));
 }
 
 /** \} */