diff --git a/app/src/components/RobotSettings/ConnectionCard.js b/app/src/components/RobotSettings/ConnectionCard.js
index f6bb032d289..2c727f42aab 100644
--- a/app/src/components/RobotSettings/ConnectionCard.js
+++ b/app/src/components/RobotSettings/ConnectionCard.js
@@ -2,11 +2,10 @@
 // RobotSettings card for wifi status
 import * as React from 'react'
 import {connect} from 'react-redux'
-import {getIn} from '@thi.ng/paths'
 import find from 'lodash/find'
 
-import {getConfig} from '../../config'
 import {makeGetRobotNetworkingStatus} from '../../http-api-client'
+import {CONNECTABLE} from '../../discovery'
 import {Card} from '@opentrons/components'
 import SelectNetwork from './SelectNetwork'
 import {ConnectionStatusMessage, ConnectionInfo} from './connection'
@@ -18,7 +17,6 @@ import type {InternetStatus, NetworkInterface} from '../../http-api-client'
 type OP = {robot: ViewableRobot}
 
 type SP = {|
-  __featureEnabled: boolean,
   internetStatus: ?InternetStatus,
   wifiNetwork: ?NetworkInterface,
   ethernetNetwork: ?NetworkInterface,
@@ -26,27 +24,32 @@ type SP = {|
 
 type Props = {...$Exact<OP>, ...SP}
 
-const __FEATURE_FLAG = 'devInternal.manageRobotConnection.newCard'
-
 export default connect(makeMapStateToProps)(ConnectionCard)
 
 const TITLE = 'Connectivity'
 function ConnectionCard (props: Props) {
-  // TODO(mc, 2018-10-15): remove feature flag
-  if (!props.__featureEnabled) return null
-
   const {robot, internetStatus, wifiNetwork, ethernetNetwork} = props
+  const disabled = robot.status !== CONNECTABLE
 
   return (
-    <Card title={TITLE}>
+    <Card title={TITLE} disabled={disabled}>
       <ConnectionStatusMessage
         type={robot.local ? 'USB' : 'Wi-Fi'}
         status={internetStatus}
       />
-      <ConnectionInfo connection={wifiNetwork} title="Wi-Fi">
+      <ConnectionInfo
+        connection={wifiNetwork}
+        title="Wi-Fi"
+        disabled={disabled}
+      >
         <SelectNetwork key={robot.name} robot={robot} />
       </ConnectionInfo>
-      <ConnectionInfo connection={ethernetNetwork} title="USB" wired />
+      <ConnectionInfo
+        connection={ethernetNetwork}
+        title="USB"
+        wired
+        disabled={disabled}
+      />
     </Card>
   )
 }
@@ -64,7 +67,6 @@ function makeMapStateToProps (): (State, OP) => SP {
       internetStatus,
       wifiNetwork: find(interfaces, {type: 'wifi'}),
       ethernetNetwork: find(interfaces, {type: 'ethernet'}),
-      __featureEnabled: !!getIn(getConfig(state), __FEATURE_FLAG),
     }
   }
 }
diff --git a/app/src/components/RobotSettings/ConnectivityCard.js b/app/src/components/RobotSettings/ConnectivityCard.js
deleted file mode 100644
index 872a43fbcc7..00000000000
--- a/app/src/components/RobotSettings/ConnectivityCard.js
+++ /dev/null
@@ -1,145 +0,0 @@
-// @flow
-// RobotSettings card for wifi status
-import * as React from 'react'
-import {connect} from 'react-redux'
-
-import {CONNECTABLE, startDiscovery} from '../../discovery'
-import {
-  fetchNetworkingStatus,
-  fetchWifiList,
-  configureWifi,
-  clearConfigureWifiResponse,
-  makeGetRobotWifiList,
-  makeGetRobotWifiConfigure,
-} from '../../http-api-client'
-
-import {RefreshCard, LabeledValue} from '@opentrons/components'
-import {CardContentFull} from '../layout'
-import WifiConnectForm from './WifiConnectForm'
-import WifiConnectModal from './WifiConnectModal'
-
-import type {State, Dispatch} from '../../types'
-import type {ViewableRobot} from '../../discovery'
-import type {FetchWifiListCall, ConfigureWifiCall} from '../../http-api-client'
-
-type OP = {robot: ViewableRobot}
-
-type SP = {|
-  listRequest: FetchWifiListCall,
-  configureRequest: ConfigureWifiCall,
-|}
-
-type DP = {|
-  refresh: () => mixed,
-  configure: (?string, ?string) => mixed,
-  clearSuccessfulConfigure: () => mixed,
-  clearFailedConfigure: () => mixed,
-|}
-
-type Props = {...$Exact<OP>, ...SP, ...DP}
-
-const TITLE = 'Connectivity'
-const CONNECTED_BY_LABEL = 'Connected by'
-
-export default connect(
-  makeMapStateToProps,
-  mapDispatchToProps
-)(ConnectivityCard)
-
-function ConnectivityCard (props: Props) {
-  const {
-    refresh,
-    clearSuccessfulConfigure,
-    clearFailedConfigure,
-    configure,
-    robot: {ip, local, name, status},
-    listRequest: {response: listResponse},
-    configureRequest: {
-      inProgress: configInProgress,
-      response: configResponse,
-      error: configError,
-    },
-  } = props
-  const disabled = status !== CONNECTABLE
-  const list = (listResponse && listResponse.list) || []
-
-  const active = list.find(network => network.active)
-  const activeSsid = active && active.ssid
-  const connectedBy = local ? 'USB' : `${activeSsid || ''} (WiFi)`
-
-  const listOptions = list.map(({active, ssid}) => ({
-    name: active ? `${ssid} *` : ssid,
-    value: ssid,
-  }))
-
-  return (
-    <React.Fragment>
-      <RefreshCard
-        watch={name}
-        refresh={refresh}
-        refreshing={configInProgress}
-        title={TITLE}
-        disabled={disabled}
-        column
-      >
-        <CardContentFull>
-          <LabeledValue
-            label={CONNECTED_BY_LABEL}
-            value={`${connectedBy} - ${ip}`}
-          />
-          <WifiConnectForm
-            key={name}
-            disabled={disabled || configInProgress}
-            activeSsid={activeSsid}
-            networks={listOptions}
-            onSubmit={configure}
-          />
-        </CardContentFull>
-      </RefreshCard>
-      {(!!configError || !!configResponse) && (
-        <WifiConnectModal
-          error={configError}
-          response={configResponse}
-          close={configError ? clearFailedConfigure : clearSuccessfulConfigure}
-        />
-      )}
-    </React.Fragment>
-  )
-}
-
-function makeMapStateToProps () {
-  const getWifiList = makeGetRobotWifiList()
-  const getWifiConfigure = makeGetRobotWifiConfigure()
-
-  return (state: State, ownProps: OP): SP => ({
-    listRequest: getWifiList(state, ownProps.robot),
-    configureRequest: getWifiConfigure(state, ownProps.robot),
-  })
-}
-
-function mapDispatchToProps (dispatch: Dispatch, ownProps: OP): DP {
-  const {robot} = ownProps
-  const configure = (ssid, psk) => dispatch(configureWifi(robot, {ssid, psk}))
-  const refresh = () => {
-    // send these requests simultaneously
-    dispatch(fetchNetworkingStatus(robot))
-    dispatch(fetchWifiList(robot))
-  }
-
-  // TODO(mc, 2018-02-26): handle refreshing the list and kicking off dispatch
-  //   more elegantly and closer to the configure response
-  const clearConfigureAction = clearConfigureWifiResponse(robot)
-  const clearFailedConfigure = () => dispatch(clearConfigureAction)
-  const clearSuccessfulConfigure = () =>
-    Promise.resolve()
-      .then(refresh)
-      .then(() => dispatch(startDiscovery()))
-      .then(() => dispatch(clearConfigureAction))
-
-  return {
-    refresh,
-    configure,
-    clearSuccessfulConfigure,
-    clearFailedConfigure,
-  }
-}
diff --git a/app/src/components/RobotSettings/SelectNetwork/ConnectForm.js b/app/src/components/RobotSettings/SelectNetwork/ConnectForm.js
index 095389f7e50..05049492267 100644
--- a/app/src/components/RobotSettings/SelectNetwork/ConnectForm.js
+++ b/app/src/components/RobotSettings/SelectNetwork/ConnectForm.js
@@ -98,12 +98,17 @@ const UNKNOWN_SECURITY_OPTIONS: Array<SelectOption> = [
 ]
 
 const getEapType = (v: FormValues): ?string => get(v, EAP_TYPE_FIELD)
-const makeEapOpt = (o: WifiEapOption) => ({label: o.displayName, value: o.name})
-const makeEapField = (o: WifiAuthField) => ({
-  type: o.type,
-  name: `${EAP_CONFIG_FIELD}.${o.name}`,
-  label: o.displayName,
-  required: o.required,
+
+const makeEapOpt = (opt: WifiEapOption) => ({
+  label: opt.displayName || opt.name,
+  value: opt.name,
+})
+
+const makeEapField = (opt: WifiAuthField) => ({
+  type: opt.type,
+  name: `${EAP_CONFIG_FIELD}.${opt.name}`,
+  label: opt.displayName,
+  required: opt.required,
 })
 
 const getEapFields = (
diff --git a/app/src/components/RobotSettings/WifiConnectModal.js b/app/src/components/RobotSettings/SelectNetwork/WifiConnectModal.js
similarity index 52%
rename from app/src/components/RobotSettings/WifiConnectModal.js
rename to app/src/components/RobotSettings/SelectNetwork/WifiConnectModal.js
index 363bc0944b4..8e2e7c2167f 100644
--- a/app/src/components/RobotSettings/WifiConnectModal.js
+++ b/app/src/components/RobotSettings/SelectNetwork/WifiConnectModal.js
@@ -3,32 +3,35 @@
 import * as React from 'react'
 
 import type {
+  WifiConfigureRequest,
   WifiConfigureResponse,
   ApiRequestError,
-} from '../../http-api-client'
+} from '../../../http-api-client'
 
 import {AlertModal} from '@opentrons/components'
-import {Portal} from '../portal'
-import {ErrorModal} from '../modals'
+import {ErrorModal} from '../../modals'
 
 type Props = {
   close: () => mixed,
-  error: ?ApiRequestError,
+  request: WifiConfigureRequest,
   response: ?WifiConfigureResponse,
+  error: ?ApiRequestError,
 }
 
-const SUCCESS_TITLE = 'Successfully connected to '
-const FAILURE_TITLE = 'Could not join network'
+const SUCCESS_TITLE = 'Successfully connected to Wi-Fi'
+const FAILURE_TITLE = 'Unable to connect to Wi-Fi'
+
+const success = ssid =>
+  `Your robot has successfully connected to Wi-Fi network ${ssid}.`
 
-const SUCCESS_MESSAGE =
-  'Your robot has successfully connected to WiFi and should appear in the robot list shortly. If not, try refreshing the list manually or rebooting the robot.'
-const FAILURE_MESSAGE =
-  'The robot was unable to connect to the selected WiFi network. Please double check your network credentials.'
+const failure = ssid =>
+  `Your robot was unable to connect to ${ssid}. Please double-check your network credentials.`
 
 const ERROR_MESSAGE_RE = /Error: (.*)$/
 
 export default function WifiConnectModal (props: Props) {
-  const {response, error, close} = props
+  const {request, response, error, close} = props
+  const {ssid} = request
 
   if (error || !response) {
     let errorMessage = 'An unknown error occurred'
@@ -47,7 +50,7 @@ export default function WifiConnectModal (props: Props) {
     return (
       <ErrorModal
         heading={FAILURE_TITLE}
-        description={FAILURE_MESSAGE}
+        description={failure(ssid)}
         close={close}
         error={modalError}
       />
@@ -55,16 +58,14 @@ export default function WifiConnectModal (props: Props) {
   }
 
   return (
-    <Portal>
-      <AlertModal
-        iconName="wifi"
-        heading={`${SUCCESS_TITLE} ${response.ssid}`}
-        onCloseClick={close}
-        buttons={[{onClick: close, children: 'close'}]}
-        alertOverlay
-      >
-        {SUCCESS_MESSAGE}
-      </AlertModal>
-    </Portal>
+    <AlertModal
+      iconName="wifi"
+      heading={SUCCESS_TITLE}
+      onCloseClick={close}
+      buttons={[{onClick: close, children: 'close'}]}
+      alertOverlay
+    >
+      {success(ssid)}
+    </AlertModal>
   )
 }
diff --git a/app/src/components/RobotSettings/SelectNetwork/index.js b/app/src/components/RobotSettings/SelectNetwork/index.js
index ddf70ad9a5a..af290f43ea6 100644
--- a/app/src/components/RobotSettings/SelectNetwork/index.js
+++ b/app/src/components/RobotSettings/SelectNetwork/index.js
@@ -9,19 +9,25 @@ import {
   fetchWifiList,
   fetchWifiEapOptions,
   fetchWifiKeys,
+  fetchNetworkingStatus,
   addWifiKey,
   configureWifi,
   makeGetRobotWifiList,
   makeGetRobotWifiEapOptions,
   makeGetRobotWifiKeys,
   makeGetRobotWifiConfigure,
+  clearConfigureWifiResponse,
 } from '../../../http-api-client'
 
+import {startDiscovery} from '../../../discovery'
+import {chainActions} from '../../../util'
+
 import {IntervalWrapper, SpinnerModal} from '@opentrons/components'
 import {Portal} from '../../portal'
 import ConnectModal from './ConnectModal'
 import ConnectForm from './ConnectForm'
 import SelectSsid from './SelectSsid'
+import WifiConnectModal from './WifiConnectModal'
 
 import type {State, Dispatch} from '../../../types'
 import type {ViewableRobot} from '../../../discovery'
@@ -31,6 +37,8 @@ import type {
   WifiEapOptionsList,
   WifiKeysList,
   WifiConfigureRequest,
+  WifiConfigureResponse,
+  ApiRequestError,
 } from '../../../http-api-client'
 
 type OP = {robot: ViewableRobot}
@@ -40,14 +48,18 @@ type SP = {|
   connectingTo: ?string,
   eapOptions: ?WifiEapOptionsList,
   keys: ?WifiKeysList,
+  configRequest: ?WifiConfigureRequest,
+  configResponse: ?WifiConfigureResponse,
+  configError: ?ApiRequestError,
 |}
 
 type DP = {|
-  fetchList: () => mixed,
   fetchEapOptions: () => mixed,
   fetchKeys: () => mixed,
   addKey: (file: File) => mixed,
   configure: WifiConfigureRequest => mixed,
+  refresh: () => mixed,
+  clearConfigure: () => mixed,
 |}
 
 type Props = {...$Exact<OP>, ...SP, ...DP}
@@ -103,14 +115,18 @@ class SelectNetwork extends React.Component<Props, SelectNetworkState> {
       connectingTo,
       eapOptions,
       keys,
-      fetchList,
-      configure,
+      refresh,
       addKey,
+      configure,
+      configRequest,
+      configResponse,
+      configError,
+      clearConfigure,
     } = this.props
     const {ssid, securityType, modalOpen} = this.state
 
     return (
-      <IntervalWrapper refresh={fetchList} interval={LIST_REFRESH_MS}>
+      <IntervalWrapper refresh={refresh} interval={LIST_REFRESH_MS}>
         <SelectSsid
           list={list}
           disabled={connectingTo != null}
@@ -140,6 +156,15 @@ class SelectNetwork extends React.Component<Props, SelectNetworkState> {
               />
             </ConnectModal>
           )}
+          {configRequest &&
+            !!(configError || configResponse) && (
+            <WifiConnectModal
+              error={configError}
+              request={configRequest}
+              response={configResponse}
+              close={clearConfigure}
+            />
+          )}
         </Portal>
       </IntervalWrapper>
     )
@@ -160,6 +185,7 @@ function makeMapStateToProps (): (State, OP) => SP {
     const {
       request: cfgRequest,
       inProgress: cfgInProgress,
+      response: cfgResponse,
       error: cfgError,
     } = getConfigureCall(state, robot)
 
@@ -169,19 +195,32 @@ function makeMapStateToProps (): (State, OP) => SP {
       keys: keysResponse && keysResponse.keys,
       connectingTo:
         !cfgError && cfgInProgress && cfgRequest ? cfgRequest.ssid : null,
+      configRequest: cfgRequest,
+      configResponse: cfgResponse,
+      configError: cfgError,
     }
   }
 }
 
 function mapDispatchToProps (dispatch: Dispatch, ownProps: OP): DP {
   const {robot} = ownProps
+  const refreshActions = [fetchWifiList(robot), fetchNetworkingStatus(robot)]
+  const configure = params =>
+    dispatch(
+      chainActions(
+        configureWifi(robot, params),
+        startDiscovery(),
+        ...refreshActions
+      )
+    )
 
   return {
-    fetchList: () => dispatch(fetchWifiList(robot)),
+    configure,
+    clearConfigure: () => dispatch(clearConfigureWifiResponse(robot)),
     fetchEapOptions: () => dispatch(fetchWifiEapOptions(robot)),
     fetchKeys: () => dispatch(fetchWifiKeys(robot)),
     addKey: file => dispatch(addWifiKey(robot, file)),
-    configure: params => dispatch(configureWifi(robot, params)),
+    refresh: () => refreshActions.forEach(dispatch),
   }
 }
 
diff --git a/app/src/components/RobotSettings/WifiConnectForm.js b/app/src/components/RobotSettings/WifiConnectForm.js
deleted file mode 100644
index 8b1e73bfd8c..00000000000
--- a/app/src/components/RobotSettings/WifiConnectForm.js
+++ /dev/null
@@ -1,87 +0,0 @@
-// @flow
-import * as React from 'react'
-
-import {OutlineButton, type DropdownOption} from '@opentrons/components'
-import {Form, Select, TextInput} from './inputs'
-import styles from './styles.css'
-
-type Props = {
-  disabled: boolean,
-  activeSsid: ?string,
-  networks: Array<DropdownOption>,
-  onSubmit: (?string, ?string) => mixed,
-}
-
-type State = {
-  ssid: ?string,
-  psk: ?string,
-}
-
-type Update = {
-  ssid?: string,
-  psk?: string,
-}
-
-export default class ConfigureWifiForm extends React.Component<Props, State> {
-  constructor (props: Props) {
-    super(props)
-    this.state = {ssid: null, psk: null}
-  }
-
-  onChange = (update: Update) => this.setState(update)
-
-  onSubmit = () => {
-    this.props.onSubmit(this.getSsid(), this.state.psk)
-    this.setState({psk: null})
-  }
-
-  getSsid (): ?string {
-    return this.state.ssid || this.props.activeSsid
-  }
-
-  render () {
-    const {activeSsid, networks} = this.props
-    const {psk} = this.state
-    const ssid = this.getSsid()
-    const inputDisabled = this.props.disabled
-    const formDisabled = inputDisabled || !ssid
-
-    return (
-      <Form
-        onSubmit={this.onSubmit}
-        disabled={formDisabled}
-        className={styles.configure_form}
-      >
-        <label className={styles.configure_label}>
-          <p>WiFi network:</p>
-          <Select
-            name='ssid'
-            value={ssid}
-            options={networks}
-            disabled={inputDisabled}
-            onChange={this.onChange}
-            className={styles.configure_input}
-          />
-        </label>
-        <label className={styles.configure_label}>
-          <p>Password:</p>
-          <TextInput
-            type='password'
-            name='psk'
-            value={psk}
-            disabled={inputDisabled}
-            onChange={this.onChange}
-            className={styles.configure_input}
-          />
-        </label>
-        <OutlineButton
-          type='submit'
-          disabled={formDisabled}
-          className={styles.configure_button}
-        >
-          {(ssid && ssid === activeSsid) ? 'Connected' : 'Join'}
-        </OutlineButton>
-      </Form>
-    )
-  }
-}
diff --git a/app/src/components/RobotSettings/connection.js b/app/src/components/RobotSettings/connection.js
index 7d5347d1c48..2fa2ee71689 100644
--- a/app/src/components/RobotSettings/connection.js
+++ b/app/src/components/RobotSettings/connection.js
@@ -1,6 +1,7 @@
 // @flow
 // UI components for displaying connection info
 import * as React from 'react'
+import cx from 'classnames'
 import {CardContentHalf} from '../layout'
 import styles from './styles.css'
 
@@ -42,19 +43,27 @@ type ConnectionInfoProps = {
   title: string,
   wired?: boolean,
   children?: React.Node,
+  disabled: ?boolean,
 }
 
 export function ConnectionInfo (props: ConnectionInfoProps) {
-  const {connection, title, wired, children} = props
+  const {connection, title, wired, children, disabled} = props
+  const labelStyles = cx(styles.connection_label, {
+    [styles.disabled]: disabled,
+  })
 
   return (
     <React.Fragment>
       <CardContentHalf>
-        <h4 className={styles.connection_label}>{title}</h4>
+        <h4 className={labelStyles}>{title}</h4>
         {children}
       </CardContentHalf>
       <CardContentHalf>
-        <NetworkAddresses connection={connection} wired={wired} />
+        <NetworkAddresses
+          connection={connection}
+          wired={wired}
+          disabled={disabled}
+        />
       </CardContentHalf>
     </React.Fragment>
   )
@@ -63,21 +72,25 @@ export function ConnectionInfo (props: ConnectionInfoProps) {
 type NetworkAddressProps = {
   connection: ?NetworkInterface,
   wired: ?boolean,
+  disabled: ?boolean,
 }
 
 function NetworkAddresses (props: NetworkAddressProps) {
   const type = props.wired ? 'Wired' : 'Wireless'
   const ip = (props.connection && props.connection.ipAddress) || 'Unknown'
   const mac = (props.connection && props.connection.macAddress) || 'Unknown'
+  const labelStyles = cx(styles.connection_label, {
+    [styles.disabled]: props.disabled,
+  })
 
   return (
     <div className={styles.wireless_info}>
       <p>
-        <span className={styles.connection_label}>{type} IP: </span>
+        <span className={labelStyles}>{type} IP: </span>
         {ip}
       </p>
       <p>
-        <span className={styles.connection_label}>{type} MAC address: </span>
+        <span className={labelStyles}>{type} MAC address: </span>
         {mac}
       </p>
     </div>
diff --git a/app/src/components/RobotSettings/index.js b/app/src/components/RobotSettings/index.js
index 529396da304..7dcc7dd4fa5 100644
--- a/app/src/components/RobotSettings/index.js
+++ b/app/src/components/RobotSettings/index.js
@@ -2,12 +2,11 @@
 // robot status panel with connect button
 import * as React from 'react'
 
-import {CardContainer, CardRow, CardColumn} from '../layout'
+import {CardContainer, CardRow} from '../layout'
 import StatusCard from './StatusCard'
 import InformationCard from './InformationCard'
 import ControlsCard from './ControlsCard'
 import ConnectionCard from './ConnectionCard'
-import ConnectivityCard from './ConnectivityCard'
 import AdvancedSettingsCard from './AdvancedSettingsCard'
 import ConnectAlertModal from './ConnectAlertModal'
 import RobotUpdateModal from './RobotUpdateModal'
@@ -38,11 +37,6 @@ export default function RobotSettings (props: Props) {
       <CardRow>
         <ConnectionCard robot={robot} />
       </CardRow>
-      <CardRow>
-        <CardColumn>
-          <ConnectivityCard robot={robot} />
-        </CardColumn>
-      </CardRow>
       <CardRow>
         <AdvancedSettingsCard robot={robot} resetUrl={resetUrl} />
       </CardRow>
diff --git a/app/src/components/RobotSettings/styles.css b/app/src/components/RobotSettings/styles.css
index 13f8574beac..7b7fc12bd26 100644
--- a/app/src/components/RobotSettings/styles.css
+++ b/app/src/components/RobotSettings/styles.css
@@ -76,3 +76,7 @@
 .wireless_info {
   padding-top: 1rem;
 }
+
+.disabled {
+  color: var(--c-font-disabled);
+}
diff --git a/app/src/config/index.js b/app/src/config/index.js
index acf814ccb2d..b062ed77486 100644
--- a/app/src/config/index.js
+++ b/app/src/config/index.js
@@ -56,13 +56,6 @@ export type Config = {
   discovery: {
     candidates: string | Array<string>,
   },
-
-  // internal development flags
-  devInternal?: {
-    manageRobotConnection?: {
-      newConnectivityCard?: boolean,
-    },
-  },
 }
 
 type UpdateConfigAction = {|
diff --git a/app/src/discovery/index.js b/app/src/discovery/index.js
index 5db70577e61..54e6e655fad 100644
--- a/app/src/discovery/index.js
+++ b/app/src/discovery/index.js
@@ -80,6 +80,6 @@ export function discoveryReducer (
   return state
 }
 
-function normalizeRobots (robots: Array<Service> = []): RobotsMap {
+export function normalizeRobots (robots: Array<Service> = []): RobotsMap {
   return groupBy(robots, 'name')
 }
diff --git a/app/src/http-api-client/__tests__/reducer.test.js b/app/src/http-api-client/__tests__/reducer.test.js
index ccfa33f4b0e..012e74ccbff 100644
--- a/app/src/http-api-client/__tests__/reducer.test.js
+++ b/app/src/http-api-client/__tests__/reducer.test.js
@@ -79,8 +79,7 @@ describe('apiReducer', () => {
   })
 
   test('handles api:FAILURE', () => {
-    const emptyState = {}
-    const oldRequestState = {
+    const state = {
       name: {
         otherPath: {inProgress: false},
         path: {
@@ -97,13 +96,7 @@ describe('apiReducer', () => {
       payload: {robot: {name: 'name'}, path: 'path', error: new Error('AH')},
     }
 
-    expect(apiReducer(emptyState, action)).toEqual({
-      name: {
-        path: {inProgress: false, error: new Error('AH')},
-      },
-    })
-
-    expect(apiReducer(oldRequestState, action)).toEqual({
+    expect(apiReducer(state, action)).toEqual({
       name: {
         otherPath: {inProgress: false},
         path: {
@@ -115,4 +108,38 @@ describe('apiReducer', () => {
       },
     })
   })
+
+  test('api:FAILURE noops if no inProgress state', () => {
+    const state = {name: {path: {inProgress: false}}}
+
+    const action = {
+      type: 'api:FAILURE',
+      payload: {robot: {name: 'name'}, path: 'path', error: new Error('AH')},
+    }
+
+    expect(apiReducer(state, action)).toEqual(state)
+  })
+
+  test('clears state for unhealthy robots on discovery:UPDATE_LIST', () => {
+    const robots = [
+      {name: 'offline', ok: false, serverOk: false, advertising: false},
+      {name: 'advertising', ok: false, serverOk: false, advertising: true},
+      {name: 'reachable', ok: false, serverOk: true, advertising: false},
+      {name: 'connectable', ok: true, serverOk: false, advertising: false},
+    ]
+    const state = {
+      offline: {path: {inProgress: false, error: new Error('AH')}},
+      advertising: {path: {inProgress: false, error: new Error('AH')}},
+      reachable: {path: {inProgress: false, error: new Error('AH')}},
+      connectable: {path: {inProgress: false, error: new Error('AH')}},
+    }
+    const action = {type: 'discovery:UPDATE_LIST', payload: {robots}}
+
+    expect(apiReducer(state, action)).toEqual({
+      offline: {},
+      advertising: {path: {inProgress: false, error: new Error('AH')}},
+      reachable: {path: {inProgress: false, error: new Error('AH')}},
+      connectable: {path: {inProgress: false, error: new Error('AH')}},
+    })
+  })
 })
diff --git a/app/src/http-api-client/networking.js b/app/src/http-api-client/networking.js
index a8f39d43daf..b0111c9963b 100644
--- a/app/src/http-api-client/networking.js
+++ b/app/src/http-api-client/networking.js
@@ -65,7 +65,8 @@ export type WifiAuthField = {
 
 export type WifiEapOption = {
   name: string,
-  displayName: string,
+  // API <= 3.4.0 does not include displayName in response
+  displayName?: string,
   options: Array<WifiAuthField>,
 }
 
diff --git a/app/src/http-api-client/reducer.js b/app/src/http-api-client/reducer.js
index a8f4105e779..2ff9bea4774 100644
--- a/app/src/http-api-client/reducer.js
+++ b/app/src/http-api-client/reducer.js
@@ -1,6 +1,10 @@
 // @flow
 // generic api reducer
+import isEmpty from 'lodash/isEmpty'
+import reduce from 'lodash/reduce'
+import {normalizeRobots} from '../discovery'
 
+import type {Service} from '@opentrons/discovery-client'
 import type {State, Action} from '../types'
 import type {BaseRobot} from '../robot'
 import type {HealthState} from './health'
@@ -57,6 +61,7 @@ export default function apiReducer (
     case 'api:FAILURE': {
       const {error} = action.payload
       const {name, path, stateByName, stateByPath} = getUpdateInfo(state, action)
+      if (!stateByPath || !stateByPath.inProgress) return state
 
       return {
         ...state,
@@ -78,6 +83,23 @@ export default function apiReducer (
         },
       }
     }
+
+    case 'discovery:UPDATE_LIST':
+      return reduce(
+        normalizeRobots(action.payload.robots),
+        (apiState: ApiState, robots: Array<Service>, name: string) => {
+          const up =
+            robots.some(r => r.ok) ||
+            robots.some(r => r.serverOk) ||
+            robots.some(r => r.advertising)
+
+          // clear api request/response state if robot is fully offline
+          return !up && !isEmpty(apiState[name])
+            ? {...apiState, [name]: {}}
+            : apiState
+        },
+        state
+      )
   }
 
   return state