diff --git a/src/app/pages/component-sidenav/component-sidenav.html b/src/app/pages/component-sidenav/component-sidenav.html
index 52e86144..489d733f 100644
--- a/src/app/pages/component-sidenav/component-sidenav.html
+++ b/src/app/pages/component-sidenav/component-sidenav.html
@@ -10,7 +10,7 @@
     </mat-sidenav>
   }
   <div class="docs-component-sidenav-content">
-    <component-page-header (toggleSidenav)="toggleSidenav(sidenav())"></component-page-header>
+    <component-page-header (toggleSidenav)="toggleSidenav()"></component-page-header>
     <div class="docs-component-sidenav-inner-content">
       <main class="docs-component-sidenav-body-content">
         <!-- If on large screen, menu resides to left of content -->
diff --git a/src/app/pages/component-sidenav/component-sidenav.ts b/src/app/pages/component-sidenav/component-sidenav.ts
index 077ccdcb..ada233dc 100644
--- a/src/app/pages/component-sidenav/component-sidenav.ts
+++ b/src/app/pages/component-sidenav/component-sidenav.ts
@@ -82,7 +82,7 @@ const SMALL_WIDTH_BREAKPOINT = 959;
   ],
 })
 export class ComponentSidenav implements OnInit, OnDestroy {
-  readonly sidenav = viewChild.required(MatSidenav);
+  readonly sidenav = viewChild(MatSidenav);
   params: Observable<Params> | undefined;
   isExtraScreenSmall: Observable<boolean>;
   isScreenSmall: Observable<boolean>;
@@ -120,8 +120,8 @@ export class ComponentSidenav implements OnInit, OnDestroy {
     this.subscriptions.unsubscribe();
   }
 
-  toggleSidenav(sidenav: MatSidenav): Promise<MatDrawerToggleResult> {
-    return sidenav.toggle();
+  toggleSidenav(): void {
+    this.sidenav()?.toggle();
   }
 }
 
diff --git a/src/app/pages/component-viewer/component-viewer.ts b/src/app/pages/component-viewer/component-viewer.ts
index cc596e4e..0b00ceb8 100644
--- a/src/app/pages/component-viewer/component-viewer.ts
+++ b/src/app/pages/component-viewer/component-viewer.ts
@@ -94,7 +94,7 @@ export class ComponentViewer implements OnDestroy {
  */
 @Directive()
 export class ComponentBaseView implements OnInit, OnDestroy {
-  readonly tableOfContents = viewChild.required<TableOfContents>('toc');
+  readonly tableOfContents = viewChild<TableOfContents>('toc');
   readonly viewers = viewChildren(DocViewer);
 
   showToc: Observable<boolean>;