diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php
index 037ec6785e4..5f906948902 100644
--- a/lib/outputrenderers.php
+++ b/lib/outputrenderers.php
@@ -1745,7 +1745,7 @@ class core_renderer extends renderer_base {
         $id = !empty($bc->attributes['id']) ? $bc->attributes['id'] : uniqid('block-');
         $context = new stdClass();
         $context->skipid = $bc->skipid;
-        $context->blockinstanceid = $bc->blockinstanceid;
+        $context->blockinstanceid = $bc->blockinstanceid ?: uniqid('fakeid-');
         $context->dockable = $bc->dockable;
         $context->id = $id;
         $context->hidden = $bc->collapsible == block_contents::HIDDEN;
diff --git a/lib/templates/block.mustache b/lib/templates/block.mustache
index a08aeed7166..c2f14818078 100644
--- a/lib/templates/block.mustache
+++ b/lib/templates/block.mustache
@@ -1,5 +1,5 @@
 {{!
-    @template theme_boost/block
+    @template core/block
 
     Example context (json):
     {