diff --git a/src/a11y-demo/a11y-demo-module.ts b/src/a11y-demo/a11y-demo-module.ts
index 9f04ce2df240..46096a0c5458 100644
--- a/src/a11y-demo/a11y-demo-module.ts
+++ b/src/a11y-demo/a11y-demo-module.ts
@@ -114,17 +114,6 @@ export class AccessibilityRoutingModule {}
     TabsAccessibilityDemo,
     ToolbarAccessibilityDemo,
     TooltipAccessibilityDemo,
-  ],
-  entryComponents: [
-    DialogAccessibilityDemo,
-    DialogAddressFormDialog,
-    DialogFruitExampleDialog,
-    DialogNeptuneExampleDialog,
-    DialogNeptuneIFrameDialog,
-    DialogWelcomeExampleDialog,
-    FoggyTabContent,
-    RainyTabContent,
-    SunnyTabContent,
   ]
 })
 export class AccessibilityDemoModule {}
diff --git a/src/dev-app/bottom-sheet/bottom-sheet-demo-module.ts b/src/dev-app/bottom-sheet/bottom-sheet-demo-module.ts
index cc26b065ec88..ee5d7b941500 100644
--- a/src/dev-app/bottom-sheet/bottom-sheet-demo-module.ts
+++ b/src/dev-app/bottom-sheet/bottom-sheet-demo-module.ts
@@ -37,7 +37,6 @@ import {BottomSheetDemo, ExampleBottomSheet} from './bottom-sheet-demo';
     RouterModule.forChild([{path: '', component: BottomSheetDemo}]),
   ],
   declarations: [BottomSheetDemo, ExampleBottomSheet],
-  entryComponents: [ExampleBottomSheet],
 })
 export class BottomSheetDemoModule {
 }
diff --git a/src/dev-app/datepicker/datepicker-demo-module.ts b/src/dev-app/datepicker/datepicker-demo-module.ts
index bc4f4f19deae..7bcfbd99df2c 100644
--- a/src/dev-app/datepicker/datepicker-demo-module.ts
+++ b/src/dev-app/datepicker/datepicker-demo-module.ts
@@ -36,7 +36,6 @@ import {CustomHeader, CustomHeaderNgContent, DatepickerDemo} from './datepicker-
     RouterModule.forChild([{path: '', component: DatepickerDemo}]),
   ],
   declarations: [CustomHeader, CustomHeaderNgContent, DatepickerDemo],
-  entryComponents: [CustomHeader, CustomHeaderNgContent],
 })
 export class DatepickerDemoModule {
 }
diff --git a/src/dev-app/dialog/dialog-demo-module.ts b/src/dev-app/dialog/dialog-demo-module.ts
index 7eadb478a9e6..54f1f5c0c907 100644
--- a/src/dev-app/dialog/dialog-demo-module.ts
+++ b/src/dev-app/dialog/dialog-demo-module.ts
@@ -31,7 +31,6 @@ import {ContentElementDialog, DialogDemo, IFrameDialog, JazzDialog} from './dial
     RouterModule.forChild([{path: '', component: DialogDemo}]),
   ],
   declarations: [ContentElementDialog, DialogDemo, IFrameDialog, JazzDialog],
-  entryComponents: [ContentElementDialog, IFrameDialog, JazzDialog],
 })
 export class DialogDemoModule {
 }
diff --git a/src/dev-app/focus-trap/focus-trap-demo-module.ts b/src/dev-app/focus-trap/focus-trap-demo-module.ts
index 34c25d799e61..3452f66ab744 100644
--- a/src/dev-app/focus-trap/focus-trap-demo-module.ts
+++ b/src/dev-app/focus-trap/focus-trap-demo-module.ts
@@ -27,7 +27,6 @@ import {FocusTrapDemo, FocusTrapShadowDomDemo, FocusTrapDialogDemo} from './focu
     RouterModule.forChild([{path: '', component: FocusTrapDemo}]),
   ],
   declarations: [FocusTrapDemo, FocusTrapShadowDomDemo, FocusTrapDialogDemo],
-  entryComponents: [FocusTrapDialogDemo],
 })
 export class FocusTrapDemoModule {
 }
diff --git a/src/dev-app/portal/portal-demo-module.ts b/src/dev-app/portal/portal-demo-module.ts
index f3760da44a24..ec7ac9e07281 100644
--- a/src/dev-app/portal/portal-demo-module.ts
+++ b/src/dev-app/portal/portal-demo-module.ts
@@ -17,7 +17,6 @@ import {PortalDemo, ScienceJoke} from './portal-demo';
     RouterModule.forChild([{path: '', component: PortalDemo}]),
   ],
   declarations: [PortalDemo, ScienceJoke],
-  entryComponents: [ScienceJoke],
 })
 export class PortalDemoModule {
 }
diff --git a/src/e2e-app/dialog/dialog-e2e-module.ts b/src/e2e-app/dialog/dialog-e2e-module.ts
index 711e108a02ba..cb68c40fdb7c 100644
--- a/src/e2e-app/dialog/dialog-e2e-module.ts
+++ b/src/e2e-app/dialog/dialog-e2e-module.ts
@@ -13,7 +13,6 @@ import {DialogE2E, TestDialog} from './dialog-e2e';
 @NgModule({
   imports: [MatDialogModule],
   declarations: [DialogE2E, TestDialog],
-  entryComponents: [TestDialog]
 })
 export class DialogE2eModule {
 }
diff --git a/tools/example-module/example-module.template b/tools/example-module/example-module.template
index 600243ba3bc8..3ab96683ff33 100644
--- a/tools/example-module/example-module.template
+++ b/tools/example-module/example-module.template
@@ -31,7 +31,6 @@ export const EXAMPLE_LIST = [${exampleList}];
 @NgModule({
   imports: EXAMPLE_MODULES,
   exports: EXAMPLE_MODULES,
-  entryComponents: EXAMPLE_LIST,
 })
 export class ExampleModule { }