diff --git a/classes/output/renderer.php b/classes/output/renderer.php
index 25ab6ed0..cd60e11f 100644
--- a/classes/output/renderer.php
+++ b/classes/output/renderer.php
@@ -62,7 +62,7 @@ public function render(renderable $widget) {
             if (method_exists($widget, 'get_component_name')) {
                 $component = $widget->get_component_name();
             } else {
-                $component = 'videotime';
+                $component = 'mod_videotime';
             }
 
             if (method_exists($widget, 'get_template_name')) {
diff --git a/classes/videotime_instance.php b/classes/videotime_instance.php
index 050c408a..fb6d994a 100644
--- a/classes/videotime_instance.php
+++ b/classes/videotime_instance.php
@@ -487,7 +487,7 @@ public function export_for_template(renderer_base $output) {
             'instance' => $this->to_record(),
             'cmid' => $cm->id,
             'haspro' => videotime_has_pro(),
-            'player' => $output->render($embeddedplayer),
+            'player' => empty($embeddedplayer) ? '' : $output->render($embeddedplayer),
             'plugins' => file_exists($CFG->dirroot . '/mod/videotime/plugin/pro/templates/plugins.mustache'),
             'uniqueid' => $this->get_uniqueid(),
             'toast' => file_exists($CFG->dirroot . '/lib/amd/src/toast.js'),