diff --git a/.eslintrc b/.eslintrc
index be435af2..e29f8784 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -4,7 +4,10 @@
     "sourceType": "module",
     "allowImportExportEverywhere": true
   },
-  "extends": "airbnb",
+  "extends": [
+    "airbnb",
+    "plugin:react/recommended"
+  ],
   "env": {
     "browser": true,
     "node": true
diff --git a/app/routes.js b/app/routes.js
index bd62973d..b6442086 100644
--- a/app/routes.js
+++ b/app/routes.js
@@ -6,7 +6,7 @@ import Activity from './routes/activity'
 import Contacts from './routes/contacts'
 import Network from './routes/network'
 
-export default () => (
+const routes = () => (
   <App>
     <Switch>
       <Route path='/contacts' component={Contacts} />
@@ -15,3 +15,5 @@ export default () => (
     </Switch>
   </App>
 )
+
+export default routes
diff --git a/app/routes/contacts/components/Contacts.js b/app/routes/contacts/components/Contacts.js
index d22c2337..63690200 100644
--- a/app/routes/contacts/components/Contacts.js
+++ b/app/routes/contacts/components/Contacts.js
@@ -148,23 +148,21 @@ class Contacts extends Component {
 
         <ul className={`${styles.friends} ${filterPulldown && styles.fade}`}>
           {
-            loadingChannelPubkeys.map(pubkey => <LoadingContact pubkey={pubkey} isClosing={false} />)
+            loadingChannelPubkeys.map(pubkey => <LoadingContact pubkey={pubkey} isClosing={false} key={pubkey} />)
           }
 
           {
             currentChannels.length > 0 && currentChannels.map((channel, index) => {
               if (closingChannelIds.includes(channel.chan_id)) {
-                return <LoadingContact pubkey={channel.remote_pubkey} isClosing />
+                return <LoadingContact pubkey={channel.remote_pubkey} isClosing key={index} />
               } else if (Object.prototype.hasOwnProperty.call(channel, 'blocks_till_open')) {
                 return <PendingContact channel={channel} key={index} />
               } else if (Object.prototype.hasOwnProperty.call(channel, 'closing_txid')) {
                 return <ClosingContact channel={channel} key={index} />
-              } else if (channel.active) {
-                return <OnlineContact channel={channel} key={index} openContactModal={openContactModal} />
               } else if (!channel.active) {
                 return <OfflineContact channel={channel} key={index} openContactModal={openContactModal} />
               }
-              return <span />
+              return <OnlineContact channel={channel} key={index} openContactModal={openContactModal} />
             })
           }
         </ul>