diff --git a/packages/spacebars/dynamic.js b/packages/spacebars/dynamic.js
index eeb4560126..609d5d3ff5 100644
--- a/packages/spacebars/dynamic.js
+++ b/packages/spacebars/dynamic.js
@@ -10,7 +10,9 @@
 
 Template.__dynamicWithDataContext.helpers({
   chooseTemplate: function (name) {
-    return Template[name] || null;
+    return Blaze._getTemplate(name, function () {
+      return Template.instance();
+    });
   }
 });