diff --git a/.eslintrc.json b/.eslintrc.json
index 9f92a9627..8b289560f 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -18,7 +18,8 @@
     "i18n": true,
     "__": true,
     "__n": true,
-    "app": true
+    "app": true,
+    "IS_WEB": true
   },
   "rules": {
     "no-multi-spaces": 0,
diff --git a/src/ui/component/common/file-selector.jsx b/src/ui/component/common/file-selector.jsx
index e542dd153..659e9597f 100644
--- a/src/ui/component/common/file-selector.jsx
+++ b/src/ui/component/common/file-selector.jsx
@@ -35,7 +35,6 @@ class FileSelector extends React.PureComponent<Props> {
 
   constructor() {
     super();
-    this.input = null;
     // @if TARGET='web'
     this.fileInput = React.createRef();
     // @endif
@@ -67,19 +66,20 @@ class FileSelector extends React.PureComponent<Props> {
     );
   }
 
-  handleFileInputSelection() {
-    const { files } = this.fileInput.current;
-    if (!files) {
-      return;
-    }
+  // TODO: Add this back for web publishing
+  // handleFileInputSelection() {
+  //   const { files } = this.fileInput.current;
+  //   if (!files) {
+  //     return;
+  //   }
 
-    const filePath = files[0];
-    const fileName = filePath.name;
+  //   const filePath = files[0];
+  //   const fileName = filePath.name;
 
-    if (this.props.onFileChosen) {
-      this.props.onFileChosen(filePath, fileName);
-    }
-  }
+  //   if (this.props.onFileChosen) {
+  //     this.props.onFileChosen(filePath, fileName);
+  //   }
+  // }
 
   input: ?HTMLInputElement;
 
@@ -91,27 +91,18 @@ class FileSelector extends React.PureComponent<Props> {
 
     return (
       <React.Fragment>
-        {/* @if TARGET='app' */}
         <FormField
-          webkitdirectory='true'
-          className='form-field--copyable'
-          type='text'
-          ref={input => {
-            if (this.input) this.input = input;
-          }}
+          webkitdirectory="true"
+          className="form-field--copyable"
+          type="text"
+          ref={this.fileInput}
           onFocus={() => {
-            if (this.input) this.input.select();
+            if (this.fileInput) this.fileInput.current.select();
           }}
-          readOnly='readonly'
+          readOnly="readonly"
           value={currentPath || __('No File Chosen')}
-          inputButton={
-            <Button button='primary' onClick={() => this.handleButtonClick()} label={label} />
-          }
+          inputButton={<Button button="primary" label={label} onClick={this.handleButtonClick} />}
         />
-        {/* @endif */}
-        {/* @if TARGET='web' */}
-        <input type='file' ref={this.fileInput} onChange={() => this.handleFileInputSelection()} />
-        {/* @endif */}
       </React.Fragment>
     );
   }
diff --git a/src/ui/component/common/unsupported-on-web.jsx b/src/ui/component/common/unsupported-on-web.jsx
new file mode 100644
index 000000000..f3e7f52c8
--- /dev/null
+++ b/src/ui/component/common/unsupported-on-web.jsx
@@ -0,0 +1,12 @@
+import React from 'react';
+import Button from 'component/button';
+
+export default function UnsupportedOnWeb() {
+  return (
+    <div className="card__content help help--warning">
+      This page is not currently supported on the web.{' '}
+      <Button button="link" label={__('Download the desktop app')} href="https://lbry.com/get" />{' '}
+      for full feature support.
+    </div>
+  );
+}
diff --git a/src/ui/component/fileViewer/internal/player.jsx b/src/ui/component/fileViewer/internal/player.jsx
index dbe94b7ef..3fd51c2dd 100644
--- a/src/ui/component/fileViewer/internal/player.jsx
+++ b/src/ui/component/fileViewer/internal/player.jsx
@@ -144,7 +144,6 @@ class MediaPlayer extends React.PureComponent<Props, State> {
     else {
       // Temp hack to help in some metadata loading cases
       setTimeout(() => {
-
         const currentMediaContainer = this.mediaContainer.current;
 
         // Clean any potential rogue instances
@@ -210,7 +209,7 @@ class MediaPlayer extends React.PureComponent<Props, State> {
     }
     const playerElement = this.mediaContainer.current;
     if (playerElement) {
-      if(playerElement.children && playerElement.children[0]) {
+      if (playerElement.children && playerElement.children[0]) {
         playerElement.children[0].play();
       }
     }
@@ -291,6 +290,15 @@ class MediaPlayer extends React.PureComponent<Props, State> {
     const { mediaType, contentType } = this.props;
     const { unplayable, fileSource, hasMetadata } = this.state;
 
+    if (['audio', 'video'].indexOf(mediaType) === -1) {
+      return {
+        isLoading: false,
+        loadingStatus: __(
+          'This file type is not currently supported on lbry.tv. Try viewing it in the desktop app.'
+        ),
+      };
+    }
+
     const loader: { isLoading: boolean, loadingStatus: ?string } = {
       isLoading: false,
       loadingStatus: null,
diff --git a/src/ui/component/publishForm/view.jsx b/src/ui/component/publishForm/view.jsx
index f10d5fe2d..044a0f262 100644
--- a/src/ui/component/publishForm/view.jsx
+++ b/src/ui/component/publishForm/view.jsx
@@ -12,6 +12,7 @@ import ChannelSection from 'component/selectChannel';
 import classnames from 'classnames';
 import FileSelector from 'component/common/file-selector';
 import SelectThumbnail from 'component/selectThumbnail';
+import UnsupportedOnWeb from 'component/common/unsupported-on-web';
 import BidHelpText from './internal/bid-help-text';
 import NameHelpText from './internal/name-help-text';
 import LicenseType from './internal/license-type';
@@ -346,297 +347,308 @@ class PublishForm extends React.PureComponent<Props> {
     const shortUri = buildURI({ contentName: name });
 
     return (
-      <Form onSubmit={this.handlePublish}>
-        <section className={classnames('card card--section', { 'card--disabled': publishing })}>
-          <header className="card__header">
-            <h2 className="card__title card__title--flex-between">
-              {__('Content')}
-              {(filePath || !!editingURI) && (
-                <Button
-                  button="inverse"
-                  icon={ICONS.CLOSE}
-                  label={__('Clear')}
-                  onClick={clearPublish}
-                />
-              )}
-            </h2>
-            <p className="card__subtitle">
-              {isStillEditing
-                ? __('You are currently editing a claim.')
-                : __('What are you publishing?')}{' '}
-              {__('Read our')}{' '}
-              <Button button="link" label={__('FAQ')} href="https://lbry.io/faq/how-to-publish" />{' '}
-              {__('to learn more.')}
-            </p>
-          </header>
-
-          <div className="card__content">
-            <FileSelector currentPath={filePath} onFileChosen={this.handleFileChange} />
-            {!!isStillEditing && name && (
-              <p className="help">
-                {__("If you don't choose a file, the file from your existing claim")}
-                {` "${name}" `}
-                {__('will be used.')}
-              </p>
-            )}
-          </div>
-        </section>
-        <div className={classnames({ 'card--disabled': formDisabled })}>
-          <section className="card card--section">
-            <div className="card__content">
-              <FormField
-                type="text"
-                name="content_title"
-                label={__('Title')}
-                placeholder={__('Titular Title')}
-                disabled={formDisabled}
-                value={title}
-                onChange={e => updatePublishForm({ title: e.target.value })}
-              />
-
-              <FormField
-                type="markdown"
-                name="content_description"
-                label={__('Description')}
-                placeholder={__('Description of your content')}
-                value={description}
-                disabled={formDisabled}
-                onChange={text => updatePublishForm({ description: text })}
-              />
-            </div>
-          </section>
-
-          <section className="card card--section">
+      <React.Fragment>
+        {IS_WEB && <UnsupportedOnWeb />}
+        <Form onSubmit={this.handlePublish}>
+          <section
+            className={classnames('card card--section', {
+              'card--disabled': IS_WEB || publishing,
+            })}
+          >
             <header className="card__header">
-              <h2 className="card__title">{__('Thumbnail')}</h2>
-              <p className="card__subtitle">
-                {uploadThumbnailStatus === THUMBNAIL_STATUSES.API_DOWN ? (
-                  __('Enter a URL for your thumbnail.')
-                ) : (
-                  <React.Fragment>
-                    {__('Upload your thumbnail (.png/.jpg/.jpeg/.gif) to')}{' '}
-                    <Button button="link" label={__('spee.ch')} href="https://spee.ch/about" />.{' '}
-                    {__('Recommended size: 800x450 (16:9)')}
-                  </React.Fragment>
+              <h2 className="card__title card__title--flex-between">
+                {__('Content')}
+                {(filePath || !!editingURI) && (
+                  <Button
+                    button="inverse"
+                    icon={ICONS.CLOSE}
+                    label={__('Clear')}
+                    onClick={clearPublish}
+                  />
                 )}
+              </h2>
+              <p className="card__subtitle">
+                {isStillEditing
+                  ? __('You are currently editing a claim.')
+                  : __('What are you publishing?')}{' '}
+                {__('Read our')}{' '}
+                <Button button="link" label={__('FAQ')} href="https://lbry.io/faq/how-to-publish" />{' '}
+                {__('to learn more.')}
               </p>
             </header>
 
-            <SelectThumbnail
-              thumbnailPath={thumbnailPath}
-              thumbnail={thumbnail}
-              uploadThumbnailStatus={uploadThumbnailStatus}
-              updatePublishForm={updatePublishForm}
-              formDisabled={formDisabled}
-              resetThumbnailStatus={resetThumbnailStatus}
-            />
-          </section>
-
-          <section className="card card--section">
-            <header className="card__header">
-              <h2 className="card__title">{__('Price')}</h2>
-              <p className="card__subtitle">{__('How much will this content cost?')}</p>
-            </header>
-
             <div className="card__content">
-              <FormField
-                type="radio"
-                name="content_free"
-                label={__('Free')}
-                checked={contentIsFree}
-                disabled={formDisabled}
-                onChange={() => updatePublishForm({ contentIsFree: true })}
-              />
-
-              <FormField
-                type="radio"
-                name="content_cost"
-                label={__('Choose price')}
-                checked={!contentIsFree}
-                disabled={formDisabled}
-                onChange={() => updatePublishForm({ contentIsFree: false })}
-              />
-              {!contentIsFree && (
-                <FormFieldPrice
-                  name="content_cost_amount"
-                  min="0"
-                  price={price}
-                  onChange={newPrice => updatePublishForm({ price: newPrice })}
-                />
-              )}
-              {price.currency !== 'LBC' && (
-                <p className="form-field__help">
-                  {__(
-                    'All content fees are charged in LBC. For non-LBC payment methods, the number of credits charged will be adjusted based on the value of LBRY credits at the time of purchase.'
-                  )}
+              <FileSelector currentPath={filePath} onFileChosen={this.handleFileChange} />
+              {!!isStillEditing && name && (
+                <p className="help">
+                  {__("If you don't choose a file, the file from your existing claim")}
+                  {` "${name}" `}
+                  {__('will be used.')}
                 </p>
               )}
             </div>
           </section>
-
-          <section className="card card--section">
-            <header className="card__header">
-              <h2 className="card__title">{__('Anonymous or under a channel?')}</h2>
-              <p className="card__subtitle">
-                {__('This is a username or handle that your content can be found under.')}{' '}
-                {__('Ex. @Marvel, @TheBeatles, @BooksByJoe')}
-              </p>
-            </header>
-
-            <div className="card__content">
-              <ChannelSection channel={channel} onChannelChange={this.handleChannelChange} />
-            </div>
-          </section>
-
-          <section className="card card--section">
-            <header className="card__header">
-              <h2 className="card__title">{__('Where can people find this content?')}</h2>
-              <p className="card__subtitle">
-                {__(
-                  'The LBRY URL is the exact address where people find your content (ex. lbry://myvideo).'
-                )}{' '}
-                <Button button="link" label={__('Learn more')} href="https://lbry.io/faq/naming" />
-              </p>
-            </header>
-
-            <div className="card__content">
-              <fieldset-group class="fieldset-group--smushed fieldset-group--disabled-prefix">
-                <fieldset-section>
-                  <label>{__('Name')}</label>
-                  <span className="form-field__prefix">{`lbry://${
-                    !channel || channel === CHANNEL_ANONYMOUS || channel === CHANNEL_NEW
-                      ? ''
-                      : `${channel}/`
-                  }`}</span>
-                </fieldset-section>
+          <div className={classnames({ 'card--disabled': formDisabled })}>
+            <section className="card card--section">
+              <div className="card__content">
                 <FormField
                   type="text"
-                  name="content_name"
-                  value={name}
-                  onChange={event => this.handleNameChange(event.target.value)}
-                  error={nameError}
+                  name="content_title"
+                  label={__('Title')}
+                  placeholder={__('Titular Title')}
+                  disabled={formDisabled}
+                  value={title}
+                  onChange={e => updatePublishForm({ title: e.target.value })}
                 />
-              </fieldset-group>
-              <div className="form-field__help">
-                <NameHelpText
-                  isStillEditing={isStillEditing}
-                  uri={uri}
-                  myClaimForUri={myClaimForUri}
-                  onEditMyClaim={this.editExistingClaim}
+
+                <FormField
+                  type="markdown"
+                  name="content_description"
+                  label={__('Description')}
+                  placeholder={__('Description of your content')}
+                  value={description}
+                  disabled={formDisabled}
+                  onChange={text => updatePublishForm({ description: text })}
                 />
               </div>
-            </div>
+            </section>
 
-            <div className={classnames('card__content', { 'card--disabled': !name })}>
-              <FormField
-                className="form-field--price-amount"
-                type="number"
-                name="content_bid"
-                step="any"
-                label={__('Deposit (LBC)')}
-                postfix="LBC"
-                value={bid}
-                error={bidError}
-                min="0"
-                disabled={!name}
-                onChange={event => this.handleBidChange(parseFloat(event.target.value))}
-                placeholder={winningBidForClaimUri ? winningBidForClaimUri + 0.1 : 0.1}
-                helper={
-                  <BidHelpText
-                    uri={shortUri}
-                    isResolvingUri={isResolvingUri}
-                    amountNeededForTakeover={amountNeededForTakeover}
+            <section className="card card--section">
+              <header className="card__header">
+                <h2 className="card__title">{__('Thumbnail')}</h2>
+                <p className="card__subtitle">
+                  {uploadThumbnailStatus === THUMBNAIL_STATUSES.API_DOWN ? (
+                    __('Enter a URL for your thumbnail.')
+                  ) : (
+                    <React.Fragment>
+                      {__('Upload your thumbnail (.png/.jpg/.jpeg/.gif) to')}{' '}
+                      <Button button="link" label={__('spee.ch')} href="https://spee.ch/about" />.{' '}
+                      {__('Recommended size: 800x450 (16:9)')}
+                    </React.Fragment>
+                  )}
+                </p>
+              </header>
+
+              <SelectThumbnail
+                thumbnailPath={thumbnailPath}
+                thumbnail={thumbnail}
+                uploadThumbnailStatus={uploadThumbnailStatus}
+                updatePublishForm={updatePublishForm}
+                formDisabled={formDisabled}
+                resetThumbnailStatus={resetThumbnailStatus}
+              />
+            </section>
+
+            <section className="card card--section">
+              <header className="card__header">
+                <h2 className="card__title">{__('Price')}</h2>
+                <p className="card__subtitle">{__('How much will this content cost?')}</p>
+              </header>
+
+              <div className="card__content">
+                <FormField
+                  type="radio"
+                  name="content_free"
+                  label={__('Free')}
+                  checked={contentIsFree}
+                  disabled={formDisabled}
+                  onChange={() => updatePublishForm({ contentIsFree: true })}
+                />
+
+                <FormField
+                  type="radio"
+                  name="content_cost"
+                  label={__('Choose price')}
+                  checked={!contentIsFree}
+                  disabled={formDisabled}
+                  onChange={() => updatePublishForm({ contentIsFree: false })}
+                />
+                {!contentIsFree && (
+                  <FormFieldPrice
+                    name="content_cost_amount"
+                    min="0"
+                    price={price}
+                    onChange={newPrice => updatePublishForm({ price: newPrice })}
                   />
-                }
-              />
-            </div>
-          </section>
+                )}
+                {price.currency !== 'LBC' && (
+                  <p className="form-field__help">
+                    {__(
+                      'All content fees are charged in LBC. For non-LBC payment methods, the number of credits charged will be adjusted based on the value of LBRY credits at the time of purchase.'
+                    )}
+                  </p>
+                )}
+              </div>
+            </section>
 
-          <section className="card card--section">
-            <div className="card__content">
-              <FormField
-                type="checkbox"
-                name="content_is_mature"
-                label={__('Mature audiences only')}
-                checked={nsfw}
-                onChange={() => updatePublishForm({ nsfw: !nsfw })}
-              />
+            <section className="card card--section">
+              <header className="card__header">
+                <h2 className="card__title">{__('Anonymous or under a channel?')}</h2>
+                <p className="card__subtitle">
+                  {__('This is a username or handle that your content can be found under.')}{' '}
+                  {__('Ex. @Marvel, @TheBeatles, @BooksByJoe')}
+                </p>
+              </header>
 
-              <FormField
-                label={__('Language')}
-                type="select"
-                name="content_language"
-                value={language}
-                onChange={event => updatePublishForm({ language: event.target.value })}
-              >
-                <option value="en">{__('English')}</option>
-                <option value="zh">{__('Chinese')}</option>
-                <option value="fr">{__('French')}</option>
-                <option value="de">{__('German')}</option>
-                <option value="jp">{__('Japanese')}</option>
-                <option value="ru">{__('Russian')}</option>
-                <option value="es">{__('Spanish')}</option>
-                <option value="id">{__('Indonesian')}</option>
-                <option value="it">{__('Italian')}</option>
-                <option value="nl">{__('Dutch')}</option>
-                <option value="tr">{__('Turkish')}</option>
-                <option value="pl">{__('Polish')}</option>
-                <option value="ms">{__('Malay')}</option>
-              </FormField>
+              <div className="card__content">
+                <ChannelSection channel={channel} onChannelChange={this.handleChannelChange} />
+              </div>
+            </section>
 
-              <LicenseType
-                licenseType={licenseType}
-                otherLicenseDescription={otherLicenseDescription}
-                licenseUrl={licenseUrl}
-                handleLicenseChange={(newLicenseType, newLicenseUrl) =>
-                  updatePublishForm({
-                    licenseType: newLicenseType,
-                    licenseUrl: newLicenseUrl,
-                  })
-                }
-                handleLicenseDescriptionChange={event =>
-                  updatePublishForm({
-                    otherLicenseDescription: event.target.value,
-                  })
-                }
-                handleLicenseUrlChange={event =>
-                  updatePublishForm({ licenseUrl: event.target.value })
-                }
-              />
-            </div>
-          </section>
+            <section className="card card--section">
+              <header className="card__header">
+                <h2 className="card__title">{__('Where can people find this content?')}</h2>
+                <p className="card__subtitle">
+                  {__(
+                    'The LBRY URL is the exact address where people find your content (ex. lbry://myvideo).'
+                  )}{' '}
+                  <Button
+                    button="link"
+                    label={__('Learn more')}
+                    href="https://lbry.io/faq/naming"
+                  />
+                </p>
+              </header>
 
-          <section className="card card--section">
-            <div className="card__content">
-              {__('By continuing, you accept the')}{' '}
-              <Button
-                button="link"
-                href="https://www.lbry.io/termsofservice"
-                label={__('LBRY Terms of Service')}
-              />
-              .
-            </div>
-          </section>
+              <div className="card__content">
+                <fieldset-group class="fieldset-group--smushed fieldset-group--disabled-prefix">
+                  <fieldset-section>
+                    <label>{__('Name')}</label>
+                    <span className="form-field__prefix">{`lbry://${
+                      !channel || channel === CHANNEL_ANONYMOUS || channel === CHANNEL_NEW
+                        ? ''
+                        : `${channel}/`
+                    }`}</span>
+                  </fieldset-section>
+                  <FormField
+                    type="text"
+                    name="content_name"
+                    value={name}
+                    onChange={event => this.handleNameChange(event.target.value)}
+                    error={nameError}
+                  />
+                </fieldset-group>
+                <div className="form-field__help">
+                  <NameHelpText
+                    isStillEditing={isStillEditing}
+                    uri={uri}
+                    myClaimForUri={myClaimForUri}
+                    onEditMyClaim={this.editExistingClaim}
+                  />
+                </div>
+              </div>
 
-          <section className="card card--section">
-            <div className="card__content">
-              <div className="card__actions">
-                <Submit
-                  label={submitLabel}
-                  disabled={
-                    formDisabled ||
-                    !formValid ||
-                    uploadThumbnailStatus === THUMBNAIL_STATUSES.IN_PROGRESS
+              <div className={classnames('card__content', { 'card--disabled': !name })}>
+                <FormField
+                  className="form-field--price-amount"
+                  type="number"
+                  name="content_bid"
+                  step="any"
+                  label={__('Deposit (LBC)')}
+                  postfix="LBC"
+                  value={bid}
+                  error={bidError}
+                  min="0"
+                  disabled={!name}
+                  onChange={event => this.handleBidChange(parseFloat(event.target.value))}
+                  placeholder={winningBidForClaimUri ? winningBidForClaimUri + 0.1 : 0.1}
+                  helper={
+                    <BidHelpText
+                      uri={shortUri}
+                      isResolvingUri={isResolvingUri}
+                      amountNeededForTakeover={amountNeededForTakeover}
+                    />
                   }
                 />
-                <Button button="link" onClick={this.handleCancelPublish} label={__('Cancel')} />
               </div>
-            </div>
-          </section>
-        </div>
+            </section>
 
-        {!formDisabled && !formValid && this.renderFormErrors()}
-      </Form>
+            <section className="card card--section">
+              <div className="card__content">
+                <FormField
+                  type="checkbox"
+                  name="content_is_mature"
+                  label={__('Mature audiences only')}
+                  checked={nsfw}
+                  onChange={() => updatePublishForm({ nsfw: !nsfw })}
+                />
+
+                <FormField
+                  label={__('Language')}
+                  type="select"
+                  name="content_language"
+                  value={language}
+                  onChange={event => updatePublishForm({ language: event.target.value })}
+                >
+                  <option value="en">{__('English')}</option>
+                  <option value="zh">{__('Chinese')}</option>
+                  <option value="fr">{__('French')}</option>
+                  <option value="de">{__('German')}</option>
+                  <option value="jp">{__('Japanese')}</option>
+                  <option value="ru">{__('Russian')}</option>
+                  <option value="es">{__('Spanish')}</option>
+                  <option value="id">{__('Indonesian')}</option>
+                  <option value="it">{__('Italian')}</option>
+                  <option value="nl">{__('Dutch')}</option>
+                  <option value="tr">{__('Turkish')}</option>
+                  <option value="pl">{__('Polish')}</option>
+                  <option value="ms">{__('Malay')}</option>
+                </FormField>
+
+                <LicenseType
+                  licenseType={licenseType}
+                  otherLicenseDescription={otherLicenseDescription}
+                  licenseUrl={licenseUrl}
+                  handleLicenseChange={(newLicenseType, newLicenseUrl) =>
+                    updatePublishForm({
+                      licenseType: newLicenseType,
+                      licenseUrl: newLicenseUrl,
+                    })
+                  }
+                  handleLicenseDescriptionChange={event =>
+                    updatePublishForm({
+                      otherLicenseDescription: event.target.value,
+                    })
+                  }
+                  handleLicenseUrlChange={event =>
+                    updatePublishForm({ licenseUrl: event.target.value })
+                  }
+                />
+              </div>
+            </section>
+
+            <section className="card card--section">
+              <div className="card__content">
+                {__('By continuing, you accept the')}{' '}
+                <Button
+                  button="link"
+                  href="https://www.lbry.io/termsofservice"
+                  label={__('LBRY Terms of Service')}
+                />
+                .
+              </div>
+            </section>
+
+            <section className="card card--section">
+              <div className="card__content">
+                <div className="card__actions">
+                  <Submit
+                    label={submitLabel}
+                    disabled={
+                      formDisabled ||
+                      !formValid ||
+                      uploadThumbnailStatus === THUMBNAIL_STATUSES.IN_PROGRESS
+                    }
+                  />
+                  <Button button="link" onClick={this.handleCancelPublish} label={__('Cancel')} />
+                </div>
+              </div>
+            </section>
+          </div>
+
+          {!formDisabled && !formValid && this.renderFormErrors()}
+        </Form>
+      </React.Fragment>
     );
   }
 }
diff --git a/src/ui/modal/modalRouter/view.jsx b/src/ui/modal/modalRouter/view.jsx
index 6ed273f43..2292c655f 100644
--- a/src/ui/modal/modalRouter/view.jsx
+++ b/src/ui/modal/modalRouter/view.jsx
@@ -95,6 +95,8 @@ class ModalRouter extends React.PureComponent<Props, State> {
   }
 
   checkShowCreditIntro(props: Props) {
+    // @if TARGET='app'
+    // This doesn't make sense to show until the web has wallet support
     const { balance, page, isCreditIntroAcknowledged } = props;
 
     if (
@@ -104,6 +106,7 @@ class ModalRouter extends React.PureComponent<Props, State> {
     ) {
       return MODALS.INSUFFICIENT_CREDITS;
     }
+    // @endif
 
     return undefined;
   }
diff --git a/src/ui/page/report/view.jsx b/src/ui/page/report/view.jsx
index 42c840176..10a4544d7 100644
--- a/src/ui/page/report/view.jsx
+++ b/src/ui/page/report/view.jsx
@@ -1,7 +1,8 @@
 import React from 'react';
 import Button from 'component/button';
 import { FormField } from 'component/common/form';
-import { Lbry, doToast } from 'lbry-redux';
+import { doToast } from 'lbry-redux';
+import { Lbryio } from 'lbryinc';
 import Page from 'component/page';
 
 class ReportPage extends React.Component {
@@ -26,7 +27,7 @@ class ReportPage extends React.Component {
       this.setState({
         submitting: true,
       });
-      Lbry.report_bug({ message }).then(() => {
+      Lbryio.call('event', 'desktop_error', { error_message }).then(() => {
         this.setState({
           submitting: false,
         });
diff --git a/src/ui/page/settings/view.jsx b/src/ui/page/settings/view.jsx
index 6fefe3ac4..6fb2980c4 100644
--- a/src/ui/page/settings/view.jsx
+++ b/src/ui/page/settings/view.jsx
@@ -2,10 +2,12 @@
 import * as ICONS from 'constants/icons';
 import * as SETTINGS from 'constants/settings';
 import * as React from 'react';
+import classnames from 'classnames';
 import { FormField, FormFieldPrice, Form } from 'component/common/form';
 import Button from 'component/button';
 import Page from 'component/page';
 import FileSelector from 'component/common/file-selector';
+import UnsupportedOnWeb from 'component/common/unsupported-on-web';
 
 export type Price = {
   currency: string,
@@ -147,12 +149,13 @@ class SettingsPage extends React.PureComponent<Props, State> {
 
     return (
       <Page>
+        {IS_WEB && <UnsupportedOnWeb />}
         {noDaemonSettings ? (
           <section className="card card--section">
             <div className="card__title">{__('Failed to load settings.')}</div>
           </section>
         ) : (
-          <React.Fragment>
+          <div className={classnames({ 'card--disabled': IS_WEB })}>
             <section className="card card--section">
               <header className="card__header">
                 <h2 className="card__title">{__('Download Directory')}</h2>
@@ -430,7 +433,7 @@ class SettingsPage extends React.PureComponent<Props, State> {
                 />
               </div>
             </section>
-          </React.Fragment>
+          </div>
         )}
       </Page>
     );
diff --git a/webpack.web.config.js b/webpack.web.config.js
index 3a93c3ade..fcb89732a 100644
--- a/webpack.web.config.js
+++ b/webpack.web.config.js
@@ -2,6 +2,7 @@ const path = require('path');
 const merge = require('webpack-merge');
 const baseConfig = require('./webpack.base.config.js');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
+const { DefinePlugin } = require('webpack');
 
 const STATIC_ROOT = path.resolve(__dirname, 'static/');
 const DIST_ROOT = path.resolve(__dirname, 'dist/');
@@ -55,6 +56,9 @@ const webConfig = {
         to: `${DIST_ROOT}/web/server.js`,
       },
     ]),
+    new DefinePlugin({
+      IS_WEB: JSON.stringify(true),
+    }),
   ],
 };