diff --git a/lms/djangoapps/teams/templates/teams/_thread_list_template.html b/lms/djangoapps/teams/templates/teams/_thread_list_template.html
new file mode 100644
index 000000000000..5ad147ed69ef
--- /dev/null
+++ b/lms/djangoapps/teams/templates/teams/_thread_list_template.html
@@ -0,0 +1,58 @@
+<%!
+from django.utils.translation import gettext as _
+%>
+
+
diff --git a/lms/djangoapps/teams/templates/teams/_underscore_templates.html b/lms/djangoapps/teams/templates/teams/_underscore_templates.html
new file mode 100644
index 000000000000..fde2766bce35
--- /dev/null
+++ b/lms/djangoapps/teams/templates/teams/_underscore_templates.html
@@ -0,0 +1,23 @@
+<%page expression_filter="h"/>
+<%namespace name='static' file='../static_content.html'/>
+<%
+from openedx.core.djangolib.js_utils import dump_js_escaped_json, js_escaped_string
+enable_discussion_home_panel = settings.FEATURES.get('ENABLE_DISCUSSION_HOME_PANEL', False)
+%>
+
+
+<%static:include path="common/templates/discussion/templates.underscore" />
diff --git a/lms/djangoapps/teams/templates/teams/teams.html b/lms/djangoapps/teams/templates/teams/teams.html
index 3dfa5b51aeb6..d2ab817d4c3a 100644
--- a/lms/djangoapps/teams/templates/teams/teams.html
+++ b/lms/djangoapps/teams/templates/teams/teams.html
@@ -64,5 +64,5 @@
%static:require_module>
%block>
-<%include file="../discussion/_underscore_templates.html" />
-<%include file="../discussion/_thread_list_template.html" />
+<%include file="_underscore_templates.html" />
+<%include file="_thread_list_template.html" />
diff --git a/openedx/envs/common.py b/openedx/envs/common.py
index 73c39325c256..140842249219 100644
--- a/openedx/envs/common.py
+++ b/openedx/envs/common.py
@@ -518,6 +518,7 @@ def make_mako_module_dir(settings):
# Since the CMS uses the LMS's list of mako template directories for the "preview"
# template engine, we define the list here
lms_mako_template_dirs_base = list(MAKO_TEMPLATE_DIRS_BASE)
+lms_mako_template_dirs_base.append(REPO_ROOT / 'lms' / 'djangoapps' / 'teams' / 'templates')
lms_mako_template_dirs_base.append(OPENEDX_ROOT / 'features' / 'course_experience' / 'templates')
CONTEXT_PROCESSORS = [