diff --git a/ui/component/app/view.jsx b/ui/component/app/view.jsx
index 1bccf726b..9ea9a5c4d 100644
--- a/ui/component/app/view.jsx
+++ b/ui/component/app/view.jsx
@@ -1,7 +1,6 @@
 // @flow
 import * as PAGES from 'constants/pages';
 import React, { useEffect, useRef, useState, useLayoutEffect } from 'react';
-import { lazyImport } from 'util/lazyImport';
 import classnames from 'classnames';
 import analytics from 'analytics';
 import Router from 'component/router/index';
@@ -18,12 +17,12 @@ import useZoom from 'effects/use-zoom';
 import useHistoryNav from 'effects/use-history-nav';
 import LANGUAGE_MIGRATIONS from 'constants/language-migrations';
 
-const FileDrop = lazyImport(() => import('component/fileDrop' /* webpackChunkName: "secondary" */));
-const ModalRouter = lazyImport(() => import('modal/modalRouter' /* webpackChunkName: "secondary" */));
-const Nag = lazyImport(() => import('component/common/nag' /* webpackChunkName: "secondary" */));
+import FileDrop from 'component/fileDrop';
+import ModalRouter from 'modal/modalRouter';
+import Nag from 'component/common/nag';
 
-const SyncFatalError = lazyImport(() => import('component/syncFatalError' /* webpackChunkName: "syncFatalError" */));
-const Yrbl = lazyImport(() => import('component/yrbl' /* webpackChunkName: "yrbl" */));
+import SyncFatalError from 'component/syncFatalError';
+import Yrbl from 'component/yrbl';
 
 // ****************************************************************************
 
@@ -330,44 +329,32 @@ function App(props: Props) {
   }, [sidebarOpen, isPersonalized, resolvedSubscriptions, subscriptions, resolveUris, setResolvedSubscriptions]);
 
   if (syncFatalError) {
-    return (
-      <React.Suspense fallback={null}>
-        <SyncFatalError />
-      </React.Suspense>
-    );
+    return <SyncFatalError />;
   }
 
   return (
     <div
       className={classnames(MAIN_WRAPPER_CLASS, {
-        // @if TARGET='app'
         [`${MAIN_WRAPPER_CLASS}--mac`]: IS_MAC,
-        // @endif
         [`${MAIN_WRAPPER_CLASS}--scrollbar`]: useCustomScrollbar,
       })}
       ref={appRef}
       onContextMenu={IS_WEB ? undefined : (e) => openContextMenu(e)}
     >
       <Router />
-      <React.Suspense fallback={null}>
-        <ModalRouter />
-        {renderFiledrop && <FileDrop />}
-      </React.Suspense>
+      <ModalRouter />
+      {renderFiledrop && <FileDrop />}
       <FileRenderFloating />
-      <React.Suspense fallback={null}>
-        {isEnhancedLayout && <Yrbl className="yrbl--enhanced" />}
+      {isEnhancedLayout && <Yrbl className="yrbl--enhanced" />}
 
-        {/* @if TARGET='app' */}
-        {showUpgradeButton && (
-          <Nag
-            message={__('An upgrade is available.')}
-            actionText={__('Install Now')}
-            onClick={requestDownloadUpgrade}
-            onClose={() => setUpgradeNagClosed(true)}
-          />
-        )}
-        {/* @endif */}
-      </React.Suspense>
+      {showUpgradeButton && (
+        <Nag
+          message={__('An upgrade is available.')}
+          actionText={__('Install Now')}
+          onClick={requestDownloadUpgrade}
+          onClose={() => setUpgradeNagClosed(true)}
+        />
+      )}
     </div>
   );
 }
diff --git a/ui/component/claimPreview/view.jsx b/ui/component/claimPreview/view.jsx
index 68349c139..38ce66c9c 100644
--- a/ui/component/claimPreview/view.jsx
+++ b/ui/component/claimPreview/view.jsx
@@ -3,7 +3,6 @@ import type { Node } from 'react';
 import React, { useEffect, forwardRef } from 'react';
 import { NavLink, withRouter } from 'react-router-dom';
 import { isEmpty } from 'util/object';
-import { lazyImport } from 'util/lazyImport';
 import classnames from 'classnames';
 import { isURIEqual, isURIValid } from 'util/lbryURI';
 import * as COLLECTIONS_CONSTS from 'constants/collections';
@@ -31,9 +30,7 @@ import { ENABLE_NO_SOURCE_CLAIMS } from 'config';
 import Button from 'component/button';
 import * as ICONS from 'constants/icons';
 
-const AbandonedChannelPreview = lazyImport(() =>
-  import('component/abandonedChannelPreview' /* webpackChunkName: "abandonedChannelPreview" */)
-);
+import AbandonedChannelPreview from 'component/abandonedChannelPreview';
 
 // preview images used on the landing page and on the channel page
 type Props = {
@@ -326,11 +323,7 @@ const ClaimPreview = forwardRef<any, {}>((props: Props, ref: any) => {
   }
 
   if (!shouldFetch && showUnresolvedClaim && !isResolvingUri && isChannelUri && claim === null) {
-    return (
-      <React.Suspense fallback={null}>
-        <AbandonedChannelPreview uri={uri} type />
-      </React.Suspense>
-    );
+    return <AbandonedChannelPreview uri={uri} type />;
   }
   if (placeholder === 'publish' && !claim && uri.startsWith('lbry://@')) {
     return null;
diff --git a/ui/component/fileRender/view.jsx b/ui/component/fileRender/view.jsx
index 5a946f868..19fa61983 100644
--- a/ui/component/fileRender/view.jsx
+++ b/ui/component/fileRender/view.jsx
@@ -1,7 +1,6 @@
 // @flow
 import { remote } from 'electron';
 import React from 'react';
-import { lazyImport } from 'util/lazyImport';
 import classnames from 'classnames';
 import * as RENDER_MODES from 'constants/file_render_modes';
 import * as KEYCODES from 'constants/keycodes';
@@ -12,17 +11,15 @@ import analytics from 'analytics';
 
 import DocumentViewer from 'component/viewers/documentViewer';
 
-// @if TARGET='app'
 // should match
 import DocxViewer from 'component/viewers/docxViewer';
 import ComicBookViewer from 'component/viewers/comicBookViewer';
 import ThreeViewer from 'component/viewers/threeViewer';
-// @endif
 
-const AppViewer = lazyImport(() => import('component/viewers/appViewer' /* webpackChunkName: "appViewer" */));
-const HtmlViewer = lazyImport(() => import('component/viewers/htmlViewer' /* webpackChunkName: "htmlViewer" */));
-const ImageViewer = lazyImport(() => import('component/viewers/imageViewer' /* webpackChunkName: "imageViewer" */));
-const PdfViewer = lazyImport(() => import('component/viewers/pdfViewer' /* webpackChunkName: "pdfViewer" */));
+import AppViewer from 'component/viewers/appViewer';
+import HtmlViewer from 'component/viewers/htmlViewer';
+import ImageViewer from 'component/viewers/imageViewer';
+import PdfViewer from 'component/viewers/pdfViewer';
 
 type Props = {
   uri: string,
@@ -96,17 +93,9 @@ class FileRender extends React.PureComponent<Props> {
           />
         );
       case RENDER_MODES.IMAGE:
-        return (
-          <React.Suspense fallback={null}>
-            <ImageViewer uri={uri} source={source} />
-          </React.Suspense>
-        );
+        return <ImageViewer uri={uri} source={source} />;
       case RENDER_MODES.HTML:
-        return (
-          <React.Suspense fallback={null}>
-            <HtmlViewer source={downloadPath || source} />
-          </React.Suspense>
-        );
+        return <HtmlViewer source={downloadPath || source} />;
       case RENDER_MODES.DOCUMENT:
       case RENDER_MODES.MARKDOWN:
         return (
@@ -126,11 +115,7 @@ class FileRender extends React.PureComponent<Props> {
       case RENDER_MODES.DOCX:
         return <DocxViewer source={downloadPath} />;
       case RENDER_MODES.PDF:
-        return (
-          <React.Suspense fallback={null}>
-            <PdfViewer source={downloadPath || source} />
-          </React.Suspense>
-        );
+        return <PdfViewer source={downloadPath || source} />;
       case RENDER_MODES.CAD:
         return (
           <ThreeViewer
@@ -154,11 +139,7 @@ class FileRender extends React.PureComponent<Props> {
           />
         );
       case RENDER_MODES.APPLICATION:
-        return (
-          <React.Suspense fallback={null}>
-            <AppViewer uri={uri} />
-          </React.Suspense>
-        );
+        return <AppViewer uri={uri} />;
     }
 
     return null;
diff --git a/ui/component/router/view.jsx b/ui/component/router/view.jsx
index 1d674485e..a9a0b6609 100644
--- a/ui/component/router/view.jsx
+++ b/ui/component/router/view.jsx
@@ -4,85 +4,75 @@ import { Route, Redirect, Switch, withRouter } from 'react-router-dom';
 
 import * as PAGES from 'constants/pages';
 import { PAGE_TITLE } from 'constants/pageTitles';
-import { lazyImport } from 'util/lazyImport';
 import { LINKED_COMMENT_QUERY_PARAM } from 'constants/comment';
 import { parseURI, isURIValid } from 'util/lbryURI';
 import { SITE_TITLE, WELCOME_VERSION } from 'config';
-import LoadingBarOneOff from 'component/loadingBarOneOff';
 import { GetLinksData } from 'util/buildHomepage';
 
 import HomePage from 'page/home';
-
-// @if TARGET='app'
-const BackupPage = lazyImport(() => import('page/backup' /* webpackChunkName: "backup" */));
-// @endif
+import BackupPage from 'page/backup';
 
 // Chunk: "secondary"
-const SignInPage = lazyImport(() => import('page/signIn' /* webpackChunkName: "secondary" */));
-const SignInWalletPasswordPage = lazyImport(() =>
-  import('page/signInWalletPassword' /* webpackChunkName: "secondary" */)
-);
-const SignUpPage = lazyImport(() => import('page/signUp' /* webpackChunkName: "secondary" */));
-const SignInVerifyPage = lazyImport(() => import('page/signInVerify' /* webpackChunkName: "secondary" */));
+import SignInPage from 'page/signIn';
+import SignInWalletPasswordPage from 'page/signInWalletPassword';
+
+import SignUpPage from 'page/signUp';
+import SignInVerifyPage from 'page/signInVerify';
 
 // Chunk: "wallet/secondary"
-const BuyPage = lazyImport(() => import('page/buy' /* webpackChunkName: "secondary" */));
-const ReceivePage = lazyImport(() => import('page/receive' /* webpackChunkName: "secondary" */));
-const SendPage = lazyImport(() => import('page/send' /* webpackChunkName: "secondary" */));
-const SwapPage = lazyImport(() => import('page/swap' /* webpackChunkName: "secondary" */));
-const WalletPage = lazyImport(() => import('page/wallet' /* webpackChunkName: "secondary" */));
+import BuyPage from 'page/buy';
+import ReceivePage from 'page/receive';
+import SendPage from 'page/send';
+import SwapPage from 'page/swap';
+import WalletPage from 'page/wallet';
 
 // Chunk: none
-const NotificationsPage = lazyImport(() => import('page/notifications' /* webpackChunkName: "secondary" */));
-const CollectionPage = lazyImport(() => import('page/collection' /* webpackChunkName: "secondary" */));
-const ChannelNew = lazyImport(() => import('page/channelNew' /* webpackChunkName: "secondary" */));
-const ChannelsFollowingDiscoverPage = lazyImport(() =>
-  import('page/channelsFollowingDiscover' /* webpackChunkName: "secondary" */)
-);
-const ChannelsFollowingPage = lazyImport(() => import('page/channelsFollowing' /* webpackChunkName: "secondary" */));
-const ChannelsPage = lazyImport(() => import('page/channels' /* webpackChunkName: "secondary" */));
-const CheckoutPage = lazyImport(() => import('page/checkoutPage' /* webpackChunkName: "checkoutPage" */));
-const CreatorDashboard = lazyImport(() => import('page/creatorDashboard' /* webpackChunkName: "secondary" */));
-const DiscoverPage = lazyImport(() => import('page/discover' /* webpackChunkName: "secondary" */));
-const EmbedWrapperPage = lazyImport(() => import('page/embedWrapper' /* webpackChunkName: "secondary" */));
-const FileListPublished = lazyImport(() => import('page/fileListPublished' /* webpackChunkName: "secondary" */));
-const FourOhFourPage = lazyImport(() => import('page/fourOhFour' /* webpackChunkName: "fourOhFour" */));
-const HelpPage = lazyImport(() => import('page/help' /* webpackChunkName: "help" */));
-const InvitePage = lazyImport(() => import('page/invite' /* webpackChunkName: "secondary" */));
-const InvitedPage = lazyImport(() => import('page/invited' /* webpackChunkName: "secondary" */));
-const LibraryPage = lazyImport(() => import('page/library' /* webpackChunkName: "secondary" */));
-const ListBlockedPage = lazyImport(() => import('page/listBlocked' /* webpackChunkName: "secondary" */));
-const ListsPage = lazyImport(() => import('page/lists' /* webpackChunkName: "secondary" */));
-const LiveStreamSetupPage = lazyImport(() => import('page/livestreamSetup' /* webpackChunkName: "secondary" */));
-const LivestreamCurrentPage = lazyImport(() => import('page/livestreamCurrent' /* webpackChunkName: "secondary" */));
-const OwnComments = lazyImport(() => import('page/ownComments' /* webpackChunkName: "ownComments" */));
-const PasswordResetPage = lazyImport(() => import('page/passwordReset' /* webpackChunkName: "secondary" */));
-const PasswordSetPage = lazyImport(() => import('page/passwordSet' /* webpackChunkName: "secondary" */));
-const PublishPage = lazyImport(() => import('page/publish' /* webpackChunkName: "secondary" */));
-const ReportContentPage = lazyImport(() => import('page/reportContent' /* webpackChunkName: "secondary" */));
-const ReportPage = lazyImport(() => import('page/report' /* webpackChunkName: "secondary" */));
-const RepostNew = lazyImport(() => import('page/repost' /* webpackChunkName: "secondary" */));
-const RewardsPage = lazyImport(() => import('page/rewards' /* webpackChunkName: "secondary" */));
-const RewardsVerifyPage = lazyImport(() => import('page/rewardsVerify' /* webpackChunkName: "secondary" */));
-const SearchPage = lazyImport(() => import('page/search' /* webpackChunkName: "secondary" */));
-const SettingsStripeCard = lazyImport(() => import('page/settingsStripeCard' /* webpackChunkName: "secondary" */));
-const SettingsStripeAccount = lazyImport(() =>
-  import('page/settingsStripeAccount' /* webpackChunkName: "secondary" */)
-);
-const SettingsCreatorPage = lazyImport(() => import('page/settingsCreator' /* webpackChunkName: "secondary" */));
-const SettingsNotificationsPage = lazyImport(() =>
-  import('page/settingsNotifications' /* webpackChunkName: "secondary" */)
-);
-const SettingsPage = lazyImport(() => import('page/settings' /* webpackChunkName: "secondary" */));
-const ShowPage = lazyImport(() => import('page/show' /* webpackChunkName: "secondary" */));
-const TagsFollowingManagePage = lazyImport(() =>
-  import('page/tagsFollowingManage' /* webpackChunkName: "secondary" */)
-);
-const TagsFollowingPage = lazyImport(() => import('page/tagsFollowing' /* webpackChunkName: "secondary" */));
-const TopPage = lazyImport(() => import('page/top' /* webpackChunkName: "secondary" */));
-const UpdatePasswordPage = lazyImport(() => import('page/passwordUpdate' /* webpackChunkName: "passwordUpdate" */));
-const Welcome = lazyImport(() => import('page/welcome' /* webpackChunkName: "secondary" */));
-const YoutubeSyncPage = lazyImport(() => import('page/youtubeSync' /* webpackChunkName: "secondary" */));
+import NotificationsPage from 'page/notifications';
+import CollectionPage from 'page/collection';
+import ChannelNew from 'page/channelNew';
+import ChannelsFollowingDiscoverPage from 'page/channelsFollowingDiscover';
+
+import ChannelsFollowingPage from 'page/channelsFollowing';
+import ChannelsPage from 'page/channels';
+import CheckoutPage from 'page/checkoutPage';
+import CreatorDashboard from 'page/creatorDashboard';
+import DiscoverPage from 'page/discover';
+import EmbedWrapperPage from 'page/embedWrapper';
+import FileListPublished from 'page/fileListPublished';
+import FourOhFourPage from 'page/fourOhFour';
+import HelpPage from 'page/help';
+import InvitePage from 'page/invite';
+import InvitedPage from 'page/invited';
+import LibraryPage from 'page/library';
+import ListBlockedPage from 'page/listBlocked';
+import ListsPage from 'page/lists';
+import LiveStreamSetupPage from 'page/livestreamSetup';
+import LivestreamCurrentPage from 'page/livestreamCurrent';
+import OwnComments from 'page/ownComments';
+import PasswordResetPage from 'page/passwordReset';
+import PasswordSetPage from 'page/passwordSet';
+import PublishPage from 'page/publish';
+import ReportContentPage from 'page/reportContent';
+import ReportPage from 'page/report';
+import RepostNew from 'page/repost';
+import RewardsPage from 'page/rewards';
+import RewardsVerifyPage from 'page/rewardsVerify';
+import SearchPage from 'page/search';
+import SettingsStripeCard from 'page/settingsStripeCard';
+import SettingsStripeAccount from 'page/settingsStripeAccount';
+
+import SettingsCreatorPage from 'page/settingsCreator';
+import SettingsNotificationsPage from 'page/settingsNotifications';
+
+import SettingsPage from 'page/settings';
+import ShowPage from 'page/show';
+import TagsFollowingManagePage from 'page/tagsFollowingManage';
+
+import TagsFollowingPage from 'page/tagsFollowing';
+import TopPage from 'page/top';
+import UpdatePasswordPage from 'page/passwordUpdate';
+import Welcome from 'page/welcome';
+import YoutubeSyncPage from 'page/youtubeSync';
 
 // Tell the browser we are handling scroll restoration
 if ('scrollRestoration' in history) {
@@ -237,105 +227,103 @@ function AppRouter(props: Props) {
   }
 
   return (
-    <React.Suspense fallback={<LoadingBarOneOff />}>
-      <Switch>
-        {/* @if TARGET='app' */}
-        {welcomeVersion < WELCOME_VERSION && <Route path="/*" component={Welcome} />}
-        {/* @endif */}
-        <Redirect
-          from={`/$/${PAGES.DEPRECATED__CHANNELS_FOLLOWING_MANAGE}`}
-          to={`/$/${PAGES.CHANNELS_FOLLOWING_DISCOVER}`}
+    <Switch>
+      {/* @if TARGET='app' */}
+      {welcomeVersion < WELCOME_VERSION && <Route path="/*" component={Welcome} />}
+      {/* @endif */}
+      <Redirect
+        from={`/$/${PAGES.DEPRECATED__CHANNELS_FOLLOWING_MANAGE}`}
+        to={`/$/${PAGES.CHANNELS_FOLLOWING_DISCOVER}`}
+      />
+      <Redirect from={`/$/${PAGES.DEPRECATED__CHANNELS_FOLLOWING}`} to={`/$/${PAGES.CHANNELS_FOLLOWING}`} />
+      <Redirect from={`/$/${PAGES.DEPRECATED__TAGS_FOLLOWING}`} to={`/$/${PAGES.TAGS_FOLLOWING}`} />
+      <Redirect from={`/$/${PAGES.DEPRECATED__TAGS_FOLLOWING_MANAGE}`} to={`/$/${PAGES.TAGS_FOLLOWING_MANAGE}`} />
+      <Redirect from={`/$/${PAGES.DEPRECATED__PUBLISH}`} to={`/$/${PAGES.UPLOAD}`} />
+      <Redirect from={`/$/${PAGES.DEPRECATED__PUBLISHED}`} to={`/$/${PAGES.UPLOADS}`} />
+
+      <Route path={`/`} exact component={HomePage} />
+      <Route path={`/$/${PAGES.DISCOVER}`} exact component={DiscoverPage} />
+      {/* $FlowFixMe */}
+      {dynamicRoutes.map((dynamicRouteProps: RowDataItem) => (
+        <Route
+          key={dynamicRouteProps.route}
+          path={dynamicRouteProps.route}
+          component={(routerProps) => <DiscoverPage {...routerProps} dynamicRouteProps={dynamicRouteProps} />}
         />
-        <Redirect from={`/$/${PAGES.DEPRECATED__CHANNELS_FOLLOWING}`} to={`/$/${PAGES.CHANNELS_FOLLOWING}`} />
-        <Redirect from={`/$/${PAGES.DEPRECATED__TAGS_FOLLOWING}`} to={`/$/${PAGES.TAGS_FOLLOWING}`} />
-        <Redirect from={`/$/${PAGES.DEPRECATED__TAGS_FOLLOWING_MANAGE}`} to={`/$/${PAGES.TAGS_FOLLOWING_MANAGE}`} />
-        <Redirect from={`/$/${PAGES.DEPRECATED__PUBLISH}`} to={`/$/${PAGES.UPLOAD}`} />
-        <Redirect from={`/$/${PAGES.DEPRECATED__PUBLISHED}`} to={`/$/${PAGES.UPLOADS}`} />
+      ))}
 
-        <Route path={`/`} exact component={HomePage} />
-        <Route path={`/$/${PAGES.DISCOVER}`} exact component={DiscoverPage} />
-        {/* $FlowFixMe */}
-        {dynamicRoutes.map((dynamicRouteProps: RowDataItem) => (
-          <Route
-            key={dynamicRouteProps.route}
-            path={dynamicRouteProps.route}
-            component={(routerProps) => <DiscoverPage {...routerProps} dynamicRouteProps={dynamicRouteProps} />}
-          />
-        ))}
+      <Route path={`/$/${PAGES.AUTH_SIGNIN}`} exact component={SignInPage} />
+      <Route path={`/$/${PAGES.AUTH_PASSWORD_RESET}`} exact component={PasswordResetPage} />
+      <Route path={`/$/${PAGES.AUTH_PASSWORD_SET}`} exact component={PasswordSetPage} />
+      <Route path={`/$/${PAGES.AUTH}`} exact component={SignUpPage} />
+      <Route path={`/$/${PAGES.AUTH}/*`} exact component={SignUpPage} />
+      <Route path={`/$/${PAGES.WELCOME}`} exact component={Welcome} />
 
-        <Route path={`/$/${PAGES.AUTH_SIGNIN}`} exact component={SignInPage} />
-        <Route path={`/$/${PAGES.AUTH_PASSWORD_RESET}`} exact component={PasswordResetPage} />
-        <Route path={`/$/${PAGES.AUTH_PASSWORD_SET}`} exact component={PasswordSetPage} />
-        <Route path={`/$/${PAGES.AUTH}`} exact component={SignUpPage} />
-        <Route path={`/$/${PAGES.AUTH}/*`} exact component={SignUpPage} />
-        <Route path={`/$/${PAGES.WELCOME}`} exact component={Welcome} />
+      <Route path={`/$/${PAGES.HELP}`} exact component={HelpPage} />
+      {/* @if TARGET='app' */}
+      <Route path={`/$/${PAGES.BACKUP}`} exact component={BackupPage} />
+      {/* @endif */}
+      <Route path={`/$/${PAGES.AUTH_VERIFY}`} exact component={SignInVerifyPage} />
+      <Route path={`/$/${PAGES.SEARCH}`} exact component={SearchPage} />
+      <Route path={`/$/${PAGES.TOP}`} exact component={TopPage} />
+      <Route path={`/$/${PAGES.SETTINGS}`} exact component={SettingsPage} />
+      <Route path={`/$/${PAGES.INVITE}/:referrer`} exact component={InvitedPage} />
+      <Route path={`/$/${PAGES.CHECKOUT}`} exact component={CheckoutPage} />
+      <Route path={`/$/${PAGES.REPORT_CONTENT}`} exact component={ReportContentPage} />
+      <Route {...props} path={`/$/${PAGES.LIST}/:collectionId`} component={CollectionPage} />
 
-        <Route path={`/$/${PAGES.HELP}`} exact component={HelpPage} />
-        {/* @if TARGET='app' */}
-        <Route path={`/$/${PAGES.BACKUP}`} exact component={BackupPage} />
-        {/* @endif */}
-        <Route path={`/$/${PAGES.AUTH_VERIFY}`} exact component={SignInVerifyPage} />
-        <Route path={`/$/${PAGES.SEARCH}`} exact component={SearchPage} />
-        <Route path={`/$/${PAGES.TOP}`} exact component={TopPage} />
-        <Route path={`/$/${PAGES.SETTINGS}`} exact component={SettingsPage} />
-        <Route path={`/$/${PAGES.INVITE}/:referrer`} exact component={InvitedPage} />
-        <Route path={`/$/${PAGES.CHECKOUT}`} exact component={CheckoutPage} />
-        <Route path={`/$/${PAGES.REPORT_CONTENT}`} exact component={ReportContentPage} />
-        <Route {...props} path={`/$/${PAGES.LIST}/:collectionId`} component={CollectionPage} />
+      <PrivateRoute {...props} exact path={`/$/${PAGES.YOUTUBE_SYNC}`} component={YoutubeSyncPage} />
+      <PrivateRoute {...props} exact path={`/$/${PAGES.TAGS_FOLLOWING}`} component={TagsFollowingPage} />
+      <PrivateRoute
+        {...props}
+        exact
+        path={`/$/${PAGES.CHANNELS_FOLLOWING}`}
+        component={isAuthenticated || !IS_WEB ? ChannelsFollowingPage : DiscoverPage}
+      />
+      <PrivateRoute {...props} path={`/$/${PAGES.SETTINGS_NOTIFICATIONS}`} component={SettingsNotificationsPage} />
+      <PrivateRoute {...props} path={`/$/${PAGES.SETTINGS_STRIPE_CARD}`} component={SettingsStripeCard} />
+      <PrivateRoute {...props} path={`/$/${PAGES.SETTINGS_STRIPE_ACCOUNT}`} component={SettingsStripeAccount} />
+      <PrivateRoute {...props} path={`/$/${PAGES.SETTINGS_UPDATE_PWD}`} component={UpdatePasswordPage} />
+      <PrivateRoute
+        {...props}
+        exact
+        path={`/$/${PAGES.CHANNELS_FOLLOWING_DISCOVER}`}
+        component={ChannelsFollowingDiscoverPage}
+      />
+      <PrivateRoute {...props} path={`/$/${PAGES.INVITE}`} component={InvitePage} />
+      <PrivateRoute {...props} path={`/$/${PAGES.CHANNEL_NEW}`} component={ChannelNew} />
+      <PrivateRoute {...props} path={`/$/${PAGES.REPOST_NEW}`} component={RepostNew} />
+      <PrivateRoute {...props} path={`/$/${PAGES.UPLOADS}`} component={FileListPublished} />
+      <PrivateRoute {...props} path={`/$/${PAGES.CREATOR_DASHBOARD}`} component={CreatorDashboard} />
+      <PrivateRoute {...props} path={`/$/${PAGES.UPLOAD}`} component={PublishPage} />
+      <PrivateRoute {...props} path={`/$/${PAGES.REPORT}`} component={ReportPage} />
+      <PrivateRoute {...props} path={`/$/${PAGES.REWARDS}`} exact component={RewardsPage} />
+      <PrivateRoute {...props} path={`/$/${PAGES.REWARDS_VERIFY}`} component={RewardsVerifyPage} />
+      <PrivateRoute {...props} path={`/$/${PAGES.LIBRARY}`} component={LibraryPage} />
+      <PrivateRoute {...props} path={`/$/${PAGES.LISTS}`} component={ListsPage} />
+      <PrivateRoute {...props} path={`/$/${PAGES.TAGS_FOLLOWING_MANAGE}`} component={TagsFollowingManagePage} />
+      <PrivateRoute {...props} path={`/$/${PAGES.SETTINGS_BLOCKED_MUTED}`} component={ListBlockedPage} />
+      <PrivateRoute {...props} path={`/$/${PAGES.SETTINGS_CREATOR}`} component={SettingsCreatorPage} />
+      <PrivateRoute {...props} path={`/$/${PAGES.WALLET}`} exact component={WalletPage} />
+      <PrivateRoute {...props} path={`/$/${PAGES.CHANNELS}`} component={ChannelsPage} />
+      <PrivateRoute {...props} path={`/$/${PAGES.LIVESTREAM}`} component={LiveStreamSetupPage} />
+      <PrivateRoute {...props} path={`/$/${PAGES.LIVESTREAM_CURRENT}`} component={LivestreamCurrentPage} />
+      <PrivateRoute {...props} path={`/$/${PAGES.BUY}`} component={BuyPage} />
+      <PrivateRoute {...props} path={`/$/${PAGES.RECEIVE}`} component={ReceivePage} />
+      <PrivateRoute {...props} path={`/$/${PAGES.SEND}`} component={SendPage} />
+      <PrivateRoute {...props} path={`/$/${PAGES.SWAP}`} component={SwapPage} />
+      <PrivateRoute {...props} path={`/$/${PAGES.NOTIFICATIONS}`} component={NotificationsPage} />
+      <PrivateRoute {...props} path={`/$/${PAGES.AUTH_WALLET_PASSWORD}`} component={SignInWalletPasswordPage} />
+      <PrivateRoute {...props} path={`/$/${PAGES.SETTINGS_OWN_COMMENTS}`} component={OwnComments} />
 
-        <PrivateRoute {...props} exact path={`/$/${PAGES.YOUTUBE_SYNC}`} component={YoutubeSyncPage} />
-        <PrivateRoute {...props} exact path={`/$/${PAGES.TAGS_FOLLOWING}`} component={TagsFollowingPage} />
-        <PrivateRoute
-          {...props}
-          exact
-          path={`/$/${PAGES.CHANNELS_FOLLOWING}`}
-          component={isAuthenticated || !IS_WEB ? ChannelsFollowingPage : DiscoverPage}
-        />
-        <PrivateRoute {...props} path={`/$/${PAGES.SETTINGS_NOTIFICATIONS}`} component={SettingsNotificationsPage} />
-        <PrivateRoute {...props} path={`/$/${PAGES.SETTINGS_STRIPE_CARD}`} component={SettingsStripeCard} />
-        <PrivateRoute {...props} path={`/$/${PAGES.SETTINGS_STRIPE_ACCOUNT}`} component={SettingsStripeAccount} />
-        <PrivateRoute {...props} path={`/$/${PAGES.SETTINGS_UPDATE_PWD}`} component={UpdatePasswordPage} />
-        <PrivateRoute
-          {...props}
-          exact
-          path={`/$/${PAGES.CHANNELS_FOLLOWING_DISCOVER}`}
-          component={ChannelsFollowingDiscoverPage}
-        />
-        <PrivateRoute {...props} path={`/$/${PAGES.INVITE}`} component={InvitePage} />
-        <PrivateRoute {...props} path={`/$/${PAGES.CHANNEL_NEW}`} component={ChannelNew} />
-        <PrivateRoute {...props} path={`/$/${PAGES.REPOST_NEW}`} component={RepostNew} />
-        <PrivateRoute {...props} path={`/$/${PAGES.UPLOADS}`} component={FileListPublished} />
-        <PrivateRoute {...props} path={`/$/${PAGES.CREATOR_DASHBOARD}`} component={CreatorDashboard} />
-        <PrivateRoute {...props} path={`/$/${PAGES.UPLOAD}`} component={PublishPage} />
-        <PrivateRoute {...props} path={`/$/${PAGES.REPORT}`} component={ReportPage} />
-        <PrivateRoute {...props} path={`/$/${PAGES.REWARDS}`} exact component={RewardsPage} />
-        <PrivateRoute {...props} path={`/$/${PAGES.REWARDS_VERIFY}`} component={RewardsVerifyPage} />
-        <PrivateRoute {...props} path={`/$/${PAGES.LIBRARY}`} component={LibraryPage} />
-        <PrivateRoute {...props} path={`/$/${PAGES.LISTS}`} component={ListsPage} />
-        <PrivateRoute {...props} path={`/$/${PAGES.TAGS_FOLLOWING_MANAGE}`} component={TagsFollowingManagePage} />
-        <PrivateRoute {...props} path={`/$/${PAGES.SETTINGS_BLOCKED_MUTED}`} component={ListBlockedPage} />
-        <PrivateRoute {...props} path={`/$/${PAGES.SETTINGS_CREATOR}`} component={SettingsCreatorPage} />
-        <PrivateRoute {...props} path={`/$/${PAGES.WALLET}`} exact component={WalletPage} />
-        <PrivateRoute {...props} path={`/$/${PAGES.CHANNELS}`} component={ChannelsPage} />
-        <PrivateRoute {...props} path={`/$/${PAGES.LIVESTREAM}`} component={LiveStreamSetupPage} />
-        <PrivateRoute {...props} path={`/$/${PAGES.LIVESTREAM_CURRENT}`} component={LivestreamCurrentPage} />
-        <PrivateRoute {...props} path={`/$/${PAGES.BUY}`} component={BuyPage} />
-        <PrivateRoute {...props} path={`/$/${PAGES.RECEIVE}`} component={ReceivePage} />
-        <PrivateRoute {...props} path={`/$/${PAGES.SEND}`} component={SendPage} />
-        <PrivateRoute {...props} path={`/$/${PAGES.SWAP}`} component={SwapPage} />
-        <PrivateRoute {...props} path={`/$/${PAGES.NOTIFICATIONS}`} component={NotificationsPage} />
-        <PrivateRoute {...props} path={`/$/${PAGES.AUTH_WALLET_PASSWORD}`} component={SignInWalletPasswordPage} />
-        <PrivateRoute {...props} path={`/$/${PAGES.SETTINGS_OWN_COMMENTS}`} component={OwnComments} />
+      <Route path={`/$/${PAGES.EMBED}/:claimName`} exact component={EmbedWrapperPage} />
+      <Route path={`/$/${PAGES.EMBED}/:claimName/:claimId`} exact component={EmbedWrapperPage} />
 
-        <Route path={`/$/${PAGES.EMBED}/:claimName`} exact component={EmbedWrapperPage} />
-        <Route path={`/$/${PAGES.EMBED}/:claimName/:claimId`} exact component={EmbedWrapperPage} />
-
-        {/* Below need to go at the end to make sure we don't match any of our pages first */}
-        <Route path="/:claimName" exact component={ShowPage} />
-        <Route path="/:claimName/:streamName" exact component={ShowPage} />
-        <Route path="/*" component={FourOhFourPage} />
-      </Switch>
-    </React.Suspense>
+      {/* Below need to go at the end to make sure we don't match any of our pages first */}
+      <Route path="/:claimName" exact component={ShowPage} />
+      <Route path="/:claimName/:streamName" exact component={ShowPage} />
+      <Route path="/*" component={FourOhFourPage} />
+    </Switch>
   );
 }
 
diff --git a/ui/component/wunderbar/view.jsx b/ui/component/wunderbar/view.jsx
index 22fb78d20..1ae053929 100644
--- a/ui/component/wunderbar/view.jsx
+++ b/ui/component/wunderbar/view.jsx
@@ -1,12 +1,10 @@
 // @flow
 import * as ICONS from 'constants/icons';
 import React from 'react';
-import { lazyImport } from 'util/lazyImport';
 import { useIsMobile } from 'effects/use-screensize';
 
-const Button = lazyImport(() => import('component/button' /* webpackChunkName: "button" */));
-const Icon = lazyImport(() => import('component/common/icon' /* webpackChunkName: "icon" */));
-const WunderbarSuggestions = lazyImport(() => import('component/wunderbarSuggestions' /* webpackChunkName: "secondary" */));
+import Button from 'component/button';
+import WunderbarSuggestions from 'component/wunderbarSuggestions';
 
 type Props = {
   doOpenMobileSearch: (any) => void,
@@ -21,27 +19,13 @@ export default function WunderBar(props: Props) {
   const isMobile = useIsMobile();
 
   return isMobile ? (
-    <React.Suspense fallback={null}>
-      <Button
-        icon={ICONS.SEARCH}
-        className="wunderbar__mobile-search"
-        onClick={() => doOpenMobileSearch({ ...props })}
-      />
-    </React.Suspense>
+    <Button icon={ICONS.SEARCH} className="wunderbar__mobile-search" onClick={() => doOpenMobileSearch({ ...props })} />
   ) : (
-    <React.Suspense
-      fallback={
-        <div className="wunderbar__wrapper wunderbar wunderbar__input" aria-disabled>
-          <Icon icon={ICONS.SEARCH} aria-disabled />
-        </div>
-      }
-    >
-      <WunderbarSuggestions
-        channelsOnly={channelsOnly}
-        noTopSuggestion={noTopSuggestion}
-        noBottomLinks={noBottomLinks}
-        customSelectAction={customSelectAction}
-      />
-    </React.Suspense>
+    <WunderbarSuggestions
+      channelsOnly={channelsOnly}
+      noTopSuggestion={noTopSuggestion}
+      noBottomLinks={noBottomLinks}
+      customSelectAction={customSelectAction}
+    />
   );
 }
diff --git a/ui/modal/modalRouter/view.jsx b/ui/modal/modalRouter/view.jsx
index 856824f28..510c51bcd 100644
--- a/ui/modal/modalRouter/view.jsx
+++ b/ui/modal/modalRouter/view.jsx
@@ -1,103 +1,75 @@
 // @flow
 import React from 'react';
 import { withRouter } from 'react-router';
-import { lazyImport } from 'util/lazyImport';
 import * as MODALS from 'constants/modal_types';
-import LoadingBarOneOff from 'component/loadingBarOneOff';
 
-const ModalAffirmPurchase = lazyImport(() =>
-  import('modal/modalAffirmPurchase' /* webpackChunkName: "modalAffirmPurchase" */)
-);
-const ModalAutoGenerateThumbnail = lazyImport(() =>
-  import('modal/modalAutoGenerateThumbnail' /* webpackChunkName: "modalAutoGenerateThumbnail" */)
-);
-const ModalAutoUpdateDownloaded = lazyImport(() =>
-  import('modal/modalAutoUpdateDownloaded' /* webpackChunkName: "modalAutoUpdateDownloaded" */)
-);
-const ModalBlockChannel = lazyImport(() =>
-  import('modal/modalBlockChannel' /* webpackChunkName: "modalBlockChannel" */)
-);
-const ModalClaimCollectionAdd = lazyImport(() =>
-  import('modal/modalClaimCollectionAdd' /* webpackChunkName: "modalClaimCollectionAdd" */)
-);
-const ModalCommentAcknowledgement = lazyImport(() =>
-  import('modal/modalCommentAcknowledgement' /* webpackChunkName: "modalCommentAcknowledgement" */)
-);
-const ModalConfirmAge = lazyImport(() => import('modal/modalConfirmAge' /* webpackChunkName: "modalConfirmAge" */));
-const ModalConfirmThumbnailUpload = lazyImport(() =>
-  import('modal/modalConfirmThumbnailUpload' /* webpackChunkName: "modalConfirmThumbnailUpload" */)
-);
-const ModalConfirmTransaction = lazyImport(() =>
-  import('modal/modalConfirmTransaction' /* webpackChunkName: "modalConfirmTransaction" */)
-);
-const ModalDeleteCollection = lazyImport(() =>
-  import('modal/modalRemoveCollection' /* webpackChunkName: "modalRemoveCollection" */)
-);
-const ModalDownloading = lazyImport(() => import('modal/modalDownloading' /* webpackChunkName: "modalDownloading" */));
-const ModalError = lazyImport(() => import('modal/modalError' /* webpackChunkName: "modalError" */));
-const ModalFileSelection = lazyImport(() =>
-  import('modal/modalFileSelection' /* webpackChunkName: "modalFileSelection" */)
-);
-const ModalFileTimeout = lazyImport(() => import('modal/modalFileTimeout' /* webpackChunkName: "modalFileTimeout" */));
-const ModalFirstReward = lazyImport(() => import('modal/modalFirstReward' /* webpackChunkName: "modalFirstReward" */));
-const ModalFirstSubscription = lazyImport(() =>
-  import('modal/modalFirstSubscription' /* webpackChunkName: "modalFirstSubscription" */)
-);
-const ModalImageUpload = lazyImport(() => import('modal/modalImageUpload' /* webpackChunkName: "modalImageUpload" */));
-const ModalMassTipsUnlock = lazyImport(() =>
-  import('modal/modalMassTipUnlock' /* webpackChunkName: "modalMassTipUnlock" */)
-);
-const ModalMobileSearch = lazyImport(() =>
-  import('modal/modalMobileSearch' /* webpackChunkName: "modalMobileSearch" */)
-);
-const ModalOpenExternalResource = lazyImport(() =>
-  import('modal/modalOpenExternalResource' /* webpackChunkName: "modalOpenExternalResource" */)
-);
-const ModalPasswordUnsave = lazyImport(() =>
-  import('modal/modalPasswordUnsave' /* webpackChunkName: "modalPasswordUnsave" */)
-);
-const ModalPhoneCollection = lazyImport(() =>
-  import('modal/modalPhoneCollection' /* webpackChunkName: "modalPhoneCollection" */)
-);
-const ModalPublish = lazyImport(() => import('modal/modalPublish' /* webpackChunkName: "modalPublish" */));
-const ModalPublishPreview = lazyImport(() =>
-  import('modal/modalPublishPreview' /* webpackChunkName: "modalPublishPreview" */)
-);
-const ModalRemoveBtcSwapAddress = lazyImport(() =>
-  import('modal/modalRemoveBtcSwapAddress' /* webpackChunkName: "modalRemoveBtcSwapAddress" */)
-);
-const ModalRemoveCard = lazyImport(() => import('modal/modalRemoveCard' /* webpackChunkName: "modalRemoveCard" */));
-const ModalRemoveComment = lazyImport(() =>
-  import('modal/modalRemoveComment' /* webpackChunkName: "modalRemoveComment" */)
-);
-const ModalRemoveFile = lazyImport(() => import('modal/modalRemoveFile' /* webpackChunkName: "modalRemoveFile" */));
-const ModalRevokeClaim = lazyImport(() => import('modal/modalRevokeClaim' /* webpackChunkName: "modalRevokeClaim" */));
-const ModalRewardCode = lazyImport(() => import('modal/modalRewardCode' /* webpackChunkName: "modalRewardCode" */));
-const ModalSendTip = lazyImport(() => import('modal/modalSendTip' /* webpackChunkName: "modalSendTip" */));
-const ModalSetReferrer = lazyImport(() => import('modal/modalSetReferrer' /* webpackChunkName: "modalSetReferrer" */));
-const ModalSignOut = lazyImport(() => import('modal/modalSignOut' /* webpackChunkName: "modalSignOut" */));
-const ModalSocialShare = lazyImport(() => import('modal/modalSocialShare' /* webpackChunkName: "modalSocialShare" */));
-const ModalSupportsLiquidate = lazyImport(() =>
-  import('modal/modalSupportsLiquidate' /* webpackChunkName: "modalSupportsLiquidate" */)
-);
-const ModalSyncEnable = lazyImport(() => import('modal/modalSyncEnable' /* webpackChunkName: "modalSyncEnable" */));
-const ModalTransactionFailed = lazyImport(() =>
-  import('modal/modalTransactionFailed' /* webpackChunkName: "modalTransactionFailed" */)
-);
-const ModalUpgrade = lazyImport(() => import('modal/modalUpgrade' /* webpackChunkName: "modalUpgrade" */));
-const ModalViewImage = lazyImport(() => import('modal/modalViewImage' /* webpackChunkName: "modalViewImage" */));
-const ModalWalletDecrypt = lazyImport(() =>
-  import('modal/modalWalletDecrypt' /* webpackChunkName: "modalWalletDecrypt" */)
-);
-const ModalWalletEncrypt = lazyImport(() =>
-  import('modal/modalWalletEncrypt' /* webpackChunkName: "modalWalletEncrypt" */)
-);
-const ModalWalletUnlock = lazyImport(() =>
-  import('modal/modalWalletUnlock' /* webpackChunkName: "modalWalletUnlock" */)
-);
-const ModalYoutubeWelcome = lazyImport(() =>
-  import('modal/modalYoutubeWelcome' /* webpackChunkName: "modalYoutubeWelcome" */)
-);
+import ModalAffirmPurchase from 'modal/modalAffirmPurchase';
+
+import ModalAutoGenerateThumbnail from 'modal/modalAutoGenerateThumbnail';
+
+import ModalAutoUpdateDownloaded from 'modal/modalAutoUpdateDownloaded';
+
+import ModalBlockChannel from 'modal/modalBlockChannel';
+
+import ModalClaimCollectionAdd from 'modal/modalClaimCollectionAdd';
+
+import ModalCommentAcknowledgement from 'modal/modalCommentAcknowledgement';
+
+import ModalConfirmAge from 'modal/modalConfirmAge';
+import ModalConfirmThumbnailUpload from 'modal/modalConfirmThumbnailUpload';
+
+import ModalConfirmTransaction from 'modal/modalConfirmTransaction';
+
+import ModalDeleteCollection from 'modal/modalRemoveCollection';
+
+import ModalDownloading from 'modal/modalDownloading';
+import ModalError from 'modal/modalError';
+import ModalFileSelection from 'modal/modalFileSelection';
+
+import ModalFileTimeout from 'modal/modalFileTimeout';
+import ModalFirstReward from 'modal/modalFirstReward';
+import ModalFirstSubscription from 'modal/modalFirstSubscription';
+
+import ModalImageUpload from 'modal/modalImageUpload';
+import ModalMassTipsUnlock from 'modal/modalMassTipUnlock';
+
+import ModalMobileSearch from 'modal/modalMobileSearch';
+
+import ModalOpenExternalResource from 'modal/modalOpenExternalResource';
+
+import ModalPasswordUnsave from 'modal/modalPasswordUnsave';
+
+import ModalPhoneCollection from 'modal/modalPhoneCollection';
+
+import ModalPublish from 'modal/modalPublish';
+import ModalPublishPreview from 'modal/modalPublishPreview';
+
+import ModalRemoveBtcSwapAddress from 'modal/modalRemoveBtcSwapAddress';
+
+import ModalRemoveCard from 'modal/modalRemoveCard';
+import ModalRemoveComment from 'modal/modalRemoveComment';
+
+import ModalRemoveFile from 'modal/modalRemoveFile';
+import ModalRevokeClaim from 'modal/modalRevokeClaim';
+import ModalRewardCode from 'modal/modalRewardCode';
+import ModalSendTip from 'modal/modalSendTip';
+import ModalSetReferrer from 'modal/modalSetReferrer';
+import ModalSignOut from 'modal/modalSignOut';
+import ModalSocialShare from 'modal/modalSocialShare';
+import ModalSupportsLiquidate from 'modal/modalSupportsLiquidate';
+
+import ModalSyncEnable from 'modal/modalSyncEnable';
+import ModalTransactionFailed from 'modal/modalTransactionFailed';
+
+import ModalUpgrade from 'modal/modalUpgrade';
+import ModalViewImage from 'modal/modalViewImage';
+import ModalWalletDecrypt from 'modal/modalWalletDecrypt';
+
+import ModalWalletEncrypt from 'modal/modalWalletEncrypt';
+
+import ModalWalletUnlock from 'modal/modalWalletUnlock';
+
+import ModalYoutubeWelcome from 'modal/modalYoutubeWelcome';
 
 type Props = {
   modal: { id: string, modalProps: {} },
@@ -222,11 +194,7 @@ function ModalRouter(props: Props) {
     return null;
   }
 
-  return (
-    <React.Suspense fallback={<LoadingBarOneOff />}>
-      <SelectedModal {...modalProps} />
-    </React.Suspense>
-  );
+  return <SelectedModal {...modalProps} />;
 }
 
 export default withRouter(ModalRouter);
diff --git a/ui/page/file/view.jsx b/ui/page/file/view.jsx
index f0954e4a3..3ea978c0e 100644
--- a/ui/page/file/view.jsx
+++ b/ui/page/file/view.jsx
@@ -2,7 +2,6 @@
 import * as PAGES from 'constants/pages';
 import * as React from 'react';
 import classnames from 'classnames';
-import { lazyImport } from 'util/lazyImport';
 import Page from 'component/page';
 import * as RENDER_MODES from 'constants/file_render_modes';
 import FileTitleSection from 'component/fileTitleSection';
@@ -16,7 +15,7 @@ import Button from 'component/button';
 import I18nMessage from 'component/i18nMessage';
 import Empty from 'component/common/empty';
 
-const PostViewer = lazyImport(() => import('component/postViewer' /* webpackChunkName: "postViewer" */));
+import PostViewer from 'component/postViewer';
 
 export const PRIMARY_PLAYER_WRAPPER_CLASS = 'file-page__video-container';
 
@@ -137,11 +136,7 @@ function FilePage(props: Props) {
     }
 
     if (isMarkdown) {
-      return (
-        <React.Suspense fallback={null}>
-          <PostViewer uri={uri} />
-        </React.Suspense>
-      );
+      return <PostViewer uri={uri} />;
     }
 
     if (RENDER_MODES.TEXT_MODES.includes(renderMode)) {
diff --git a/ui/page/show/view.jsx b/ui/page/show/view.jsx
index 837d380ff..70182adec 100644
--- a/ui/page/show/view.jsx
+++ b/ui/page/show/view.jsx
@@ -2,7 +2,6 @@
 import { ENABLE_NO_SOURCE_CLAIMS } from 'config';
 import * as PAGES from 'constants/pages';
 import React, { useEffect } from 'react';
-import { lazyImport } from 'util/lazyImport';
 import { Redirect, useHistory } from 'react-router-dom';
 import Spinner from 'component/spinner';
 import ChannelPage from 'page/channel';
@@ -13,12 +12,10 @@ import { formatLbryUrlForWeb } from 'util/url';
 import { parseURI } from 'util/lbryURI';
 import * as COLLECTIONS_CONSTS from 'constants/collections';
 
-const AbandonedChannelPreview = lazyImport(() =>
-  import('component/abandonedChannelPreview' /* webpackChunkName: "abandonedChannelPreview" */)
-);
-const FilePage = lazyImport(() => import('page/file' /* webpackChunkName: "filePage" */));
-const LivestreamPage = lazyImport(() => import('page/livestream' /* webpackChunkName: "livestream" */));
-const Yrbl = lazyImport(() => import('component/yrbl' /* webpackChunkName: "yrbl" */));
+import AbandonedChannelPreview from 'component/abandonedChannelPreview';
+import FilePage from 'page/file';
+import LivestreamPage from 'page/livestream';
+import Yrbl from 'component/yrbl';
 
 type Props = {
   isResolvingUri: boolean,
@@ -146,11 +143,7 @@ function ShowPage(props: Props) {
             />
           </div>
         )}
-        {!isResolvingUri && isSubscribed && claim === null && (
-          <React.Suspense fallback={null}>
-            <AbandonedChannelPreview uri={uri} type={'large'} />
-          </React.Suspense>
-        )}
+        {!isResolvingUri && isSubscribed && claim === null && <AbandonedChannelPreview uri={uri} type={'large'} />}
       </Page>
     );
   } else if (claim.name.length && claim.name[0] === '@') {
@@ -189,7 +182,7 @@ function ShowPage(props: Props) {
     }
   }
 
-  return <React.Suspense fallback={null}>{innerContent}</React.Suspense>;
+  return <React.Fragment>{innerContent}</React.Fragment>;
 }
 
 export default ShowPage;