diff --git a/background.html b/background.html
index afbb39109..cfbdbcffe 100644
--- a/background.html
+++ b/background.html
@@ -594,7 +594,6 @@
   <script type='text/javascript' src='js/views/seed_dialog_view.js'></script>
   <script type='text/javascript' src='js/views/qr_dialog_view.js'></script>
   <script type='text/javascript' src='js/views/connecting_to_server_dialog_view.js'></script>
-  <script type='text/javascript' src='js/views/add_server_dialog_view.js'></script>
   <script type='text/javascript' src='js/views/beta_release_disclaimer_view.js'></script>
   <script type='text/javascript' src='js/views/identicon_svg_view.js'></script>
   <script type='text/javascript' src='js/views/install_view.js'></script>
diff --git a/js/background.js b/js/background.js
index 4486f241e..44bacfea9 100644
--- a/js/background.js
+++ b/js/background.js
@@ -1194,12 +1194,6 @@
       }
     });
 
-    Whisper.events.on('showAddServerDialog', async options => {
-      if (appView) {
-        appView.showAddServerDialog(options);
-      }
-    });
-
     Whisper.events.on('showQRDialog', async () => {
       if (appView) {
         const ourNumber = textsecure.storage.user.getNumber();
diff --git a/js/modules/signal.js b/js/modules/signal.js
index b5f158f06..e818dd603 100644
--- a/js/modules/signal.js
+++ b/js/modules/signal.js
@@ -55,8 +55,9 @@ const { UserDetailsDialog } = require('../../ts/components/UserDetailsDialog');
 const {
   DevicePairingDialog,
 } = require('../../ts/components/DevicePairingDialog');
-const { AddServerDialog } = require('../../ts/components/AddServerDialog');
-
+const {
+  SessionSettings,
+} = require('../../ts/components/session/SessionSettings');
 const { SessionToast } = require('../../ts/components/session/SessionToast');
 const { SessionToggle } = require('../../ts/components/session/SessionToggle');
 const { SessionModal } = require('../../ts/components/session/SessionModal');
@@ -266,7 +267,6 @@ exports.setup = (options = {}) => {
     EditProfileDialog,
     UserDetailsDialog,
     DevicePairingDialog,
-    AddServerDialog,
     SessionRegistrationView,
     ConfirmDialog,
     UpdateGroupDialog,
diff --git a/js/views/add_server_dialog_view.js b/js/views/add_server_dialog_view.js
deleted file mode 100644
index e81c895ad..000000000
--- a/js/views/add_server_dialog_view.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/* global Whisper, i18n, */
-
-// eslint-disable-next-line func-names
-(function() {
-  'use strict';
-
-  window.Whisper = window.Whisper || {};
-
-  Whisper.AddServerDialogView = Whisper.View.extend({
-    className: 'loki-dialog add-server-dialog modal',
-    initialize() {
-      this.close = this.close.bind(this);
-      this.render();
-    },
-
-    render() {
-      this.dialogView = new Whisper.ReactWrapperView({
-        className: 'add-server-dialog',
-        Component: window.Signal.Components.AddServerDialog,
-        props: {
-          i18n,
-          onClose: this.close,
-        },
-      });
-
-      this.$el.append(this.dialogView.el);
-      return this;
-    },
-
-    close() {
-      this.remove();
-    },
-  });
-})();
diff --git a/js/views/app_view.js b/js/views/app_view.js
index b3e30bb57..e1804c4ba 100644
--- a/js/views/app_view.js
+++ b/js/views/app_view.js
@@ -244,10 +244,6 @@
       const dialog = new Whisper.DevicePairingWordsDialogView();
       this.el.append(dialog.el);
     },
-    showAddServerDialog() {
-      const dialog = new Whisper.AddServerDialogView();
-      this.el.append(dialog.el);
-    },
     showCreateGroup() {
       // TODO: make it impossible to open 2 dialogs as once
       // Curretnly, if the button is in focus, it is possible to