diff --git a/CHANGELOG-2.x.md b/CHANGELOG-2.x.md
index ba96d976c2..2fb0f621f8 100644
--- a/CHANGELOG-2.x.md
+++ b/CHANGELOG-2.x.md
@@ -3,6 +3,7 @@
 ## Unreleased
 
 - Add sticky footer.
+- Remove empty doc sidebar container
 
 ## 2.0.0-alpha.30
 
diff --git a/packages/docusaurus-theme-classic/src/theme/DocPage/index.js b/packages/docusaurus-theme-classic/src/theme/DocPage/index.js
index dfb6917c40..cbcdecb100 100644
--- a/packages/docusaurus-theme-classic/src/theme/DocPage/index.js
+++ b/packages/docusaurus-theme-classic/src/theme/DocPage/index.js
@@ -23,13 +23,15 @@ function DocPage(props) {
   return (
     <Layout noFooter>
       <div className={styles.docPage}>
-        <div className={styles.docSidebarContainer}>
-          <DocSidebar
-            docsSidebars={docsSidebars}
-            location={location}
-            sidebar={sidebar}
-          />
-        </div>
+        {sidebar && (
+          <div className={styles.docSidebarContainer}>
+            <DocSidebar
+              docsSidebars={docsSidebars}
+              location={location}
+              sidebar={sidebar}
+            />
+          </div>
+        )}
         <main className={styles.docMainContainer}>
           <MDXProvider components={MDXComponents}>
             {renderRoutes(route.routes)}