diff --git a/ts/components/DevicePairingDialog.tsx b/ts/components/DevicePairingDialog.tsx
index 05799361d..c74036b49 100644
--- a/ts/components/DevicePairingDialog.tsx
+++ b/ts/components/DevicePairingDialog.tsx
@@ -70,7 +70,6 @@ export class DevicePairingDialog extends React.Component<Props, State> {
     );
   }
 
-
   public renderFilterRequestsView() {
     const { currentPubKey, accepted, deviceAlias } = this.state;
     let secretWords: undefined;
@@ -300,13 +299,9 @@ export class DevicePairingDialog extends React.Component<Props, State> {
       if (conv) {
         conv.setNickname(this.state.deviceAlias);
       }
-      // FIXME do not show linked device in list of contacts
-      console.log('FIXME');
 
       return;
     }
-    /* this.$('.transmissionStatus').text(errors);
-    this.$('.requestAcceptedView .ok').show();*/
 
     this.setState({
       errors: errors,
diff --git a/ts/components/session/settings/SessionSettings.tsx b/ts/components/session/settings/SessionSettings.tsx
index 2baf58b2c..7291185fb 100644
--- a/ts/components/session/settings/SessionSettings.tsx
+++ b/ts/components/session/settings/SessionSettings.tsx
@@ -456,4 +456,3 @@ export class SettingsView extends React.Component<SettingsViewProps, State> {
       });
   }
 }
-//     //this.$('#startPairing').removeAttr('disabled');
diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts
index a66dc1569..90e175192 100644
--- a/ts/state/selectors/conversations.ts
+++ b/ts/state/selectors/conversations.ts
@@ -124,7 +124,7 @@ export const _getLeftPaneLists = (
       };
     }
 
-    if (conversation.isFriend) {
+    if (conversation.isFriend && conversation.activeAt !== undefined) {
       friends.push(conversation);
     }