diff --git a/lms/templates/courseware/course_navigation.html b/lms/templates/courseware/course_navigation.html
index fd9ab42eec..1ec271aacc 100644
--- a/lms/templates/courseware/course_navigation.html
+++ b/lms/templates/courseware/course_navigation.html
@@ -20,7 +20,7 @@ def url_class(is_active):
 <%! from courseware.views import notification_image_for_tab %>
 <% import waffle %>
 
-% if disable_tabs is UNDEFINED:
+% if disable_tabs is UNDEFINED or not disable_tabs:
 <nav class="${active_page} course-material">
   <div class="inner-wrapper">
     <ol class="course-tabs">
diff --git a/lms/templates/courseware/courseware.html b/lms/templates/courseware/courseware.html
index f25dcfb167..5385b8058d 100644
--- a/lms/templates/courseware/courseware.html
+++ b/lms/templates/courseware/courseware.html
@@ -189,7 +189,7 @@ ${fragment.foot_html()}
 <div class="container">
   <div class="course-wrapper">
 
-% if disable_accordion is UNDEFINED:
+% if disable_accordion is UNDEFINED or not disable_accordion:
     <div class="course-index" role="navigation">
       <header id="open_close_accordion">
         <a href="#">${_("close")}</a>