diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index 084ff98851..8c4b6fc857 100644
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -62,6 +62,7 @@
 #include "llfloaterreg.h"
 #include "llfloaterregiondebugconsole.h"
 #include "llfloatertelehub.h"
+#include "llgltfmateriallist.h"
 #include "llinventorymodel.h"
 #include "lllineeditor.h"
 #include "llnamelistctrl.h"
@@ -1394,7 +1395,7 @@ LLPanelRegionTerrainInfo::LLPanelRegionTerrainInfo()
     }
     for (S32 i = 0; i < LLTerrainMaterials::ASSET_COUNT; ++i)
     {
-        mLastSetMaterials[i] = LLUUID::null;
+        mLastSetMaterials[i] = LLGLTFMaterialList::BLANK_MATERIAL_ASSET_ID;
     }
 }
 
diff --git a/indra/newview/skins/default/xui/en/panel_region_terrain.xml b/indra/newview/skins/default/xui/en/panel_region_terrain.xml
index 38d885d72d..4a2c0d42b9 100644
--- a/indra/newview/skins/default/xui/en/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_terrain.xml
@@ -161,7 +161,7 @@
      left="10"
      name="material_detail_0"
      pick_type="material"
-     allow_no_texture="true"
+     default_image_id="968cbad0-4dad-d64e-71b5-72bf13ad051a"
      top_delta="0"
      width="100" />
     <texture_picker
@@ -172,7 +172,7 @@
      left_pad="10"
      name="material_detail_1"
      pick_type="material"
-     allow_no_texture="true"
+     default_image_id="968cbad0-4dad-d64e-71b5-72bf13ad051a"
      top_delta="0"
      width="100" />
     <texture_picker
@@ -183,7 +183,7 @@
      left_pad="10"
      name="material_detail_2"
      pick_type="material"
-     allow_no_texture="true"
+     default_image_id="968cbad0-4dad-d64e-71b5-72bf13ad051a"
      top_delta="0"
      width="100" />
     <texture_picker
@@ -194,7 +194,7 @@
      left_pad="10"
      name="material_detail_3"
      pick_type="material"
-     allow_no_texture="true"
+     default_image_id="968cbad0-4dad-d64e-71b5-72bf13ad051a"
      top_delta="0"
      width="100" />
     <text