diff --git a/plugins/techdocs/src/home/components/index.ts b/plugins/techdocs/src/home/components/index.ts
index be8029687b..a6ecc2be39 100644
--- a/plugins/techdocs/src/home/components/index.ts
+++ b/plugins/techdocs/src/home/components/index.ts
@@ -16,15 +16,12 @@
 
 export * from './Grids';
 export * from './Tables';
-export { DefaultTechDocsHome } from './DefaultTechDocsHome';
+export * from './DefaultTechDocsHome';
 export type {
   PanelType,
   PanelConfig,
   TabConfig,
   TabsConfig,
 } from './TechDocsCustomHome';
-export {
-  TechDocsPageWrapper,
-  type TechDocsPageWrapperProps,
-} from './TechDocsPageWrapper';
-export { TechDocsPicker } from './TechDocsPicker';
+export * from './TechDocsPageWrapper';
+export * from './TechDocsPicker';
diff --git a/plugins/techdocs/src/search/components/TechDocsSearch.tsx b/plugins/techdocs/src/search/components/TechDocsSearch.tsx
index 74e2ac554e..c817fb3217 100644
--- a/plugins/techdocs/src/search/components/TechDocsSearch.tsx
+++ b/plugins/techdocs/src/search/components/TechDocsSearch.tsx
@@ -28,7 +28,7 @@ import Autocomplete from '@material-ui/lab/Autocomplete';
 import React, { ChangeEvent, useEffect, useState } from 'react';
 import { useNavigate } from 'react-router';
 import useDebounce from 'react-use/lib/useDebounce';
-import { TechDocsSearchResultListItem } from '../../search';
+import { TechDocsSearchResultListItem } from './TechDocsSearchResultListItem';
 
 const useStyles = makeStyles({
   root: {