diff --git a/background.html b/background.html
index d865a59f6..8312a1ba0 100644
--- a/background.html
+++ b/background.html
@@ -1,13 +1,14 @@
 <!DOCTYPE html>
 <html>
+
 <head>
   <meta charset='utf-8'>
-  <meta content='width=device-width, user-scalable=no, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0' name='viewport'>
+  <meta content='width=device-width, user-scalable=no, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0'
+    name='viewport'>
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="description" content="">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta http-equiv="Content-Security-Policy"
-    content="default-src 'none';
+  <meta http-equiv="Content-Security-Policy" content="default-src 'none';
             child-src 'self';
             connect-src 'self' https: wss:;
             font-src 'self';
@@ -17,8 +18,7 @@
             media-src 'self' blob:;
             object-src 'none';
             script-src 'self' 'unsafe-eval';
-            style-src 'self' 'unsafe-inline';"
-  >
+            style-src 'self' 'unsafe-inline';">
   <title>Session</title>
   <link href='images/sesion/session_icon_128.png' rel='shortcut icon'>
   <link href="stylesheets/manifest.css" rel="stylesheet" type="text/css" />
@@ -166,7 +166,6 @@
   <script type='text/javascript' src='js/views/moderators_add_dialog_view.js'></script>
   <script type='text/javascript' src='js/views/moderators_remove_dialog_view.js'></script>
   <script type='text/javascript' src='js/views/user_details_dialog_view.js'></script>
-  <script type='text/javascript' src='js/views/nickname_dialog_view.js'></script>
   <script type='text/javascript' src='js/views/password_dialog_view.js'></script>
   <script type='text/javascript' src='js/views/seed_dialog_view.js'></script>
   <script type='text/javascript' src='js/views/session_id_reset_view.js'></script>
@@ -174,6 +173,7 @@
   <!-- CRYPTO -->
   <script type='text/javascript' src='js/wall_clock_listener.js'></script>
 </head>
+
 <body>
   <div class='app-loading-screen'>
     <div class="content session-full-logo">
@@ -184,4 +184,5 @@
 
   <script type='text/javascript' src='js/background.js'></script>
 </body>
-</html>
+
+</html>
\ No newline at end of file
diff --git a/background_test.html b/background_test.html
index 63c232333..353d0a78e 100644
--- a/background_test.html
+++ b/background_test.html
@@ -1,13 +1,14 @@
 <!DOCTYPE html>
 <html>
+
 <head>
   <meta charset='utf-8'>
-  <meta content='width=device-width, user-scalable=no, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0' name='viewport'>
+  <meta content='width=device-width, user-scalable=no, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0'
+    name='viewport'>
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="description" content="">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta http-equiv="Content-Security-Policy"
-    content="default-src 'none';
+  <meta http-equiv="Content-Security-Policy" content="default-src 'none';
             child-src 'self';
             connect-src 'self' https: wss:;
             font-src 'self';
@@ -17,8 +18,7 @@
             media-src 'self' blob:;
             object-src 'none';
             script-src 'self' 'unsafe-eval';
-            style-src 'self' 'unsafe-inline';"
-  >
+            style-src 'self' 'unsafe-inline';">
   <title>Session</title>
   <link href='images/session/session_icon_128.png' rel='shortcut icon'>
   <link href="stylesheets/manifest.css" rel="stylesheet" type="text/css" />
@@ -170,13 +170,13 @@
   <script type='text/javascript' src='js/views/moderators_add_dialog_view.js'></script>
   <script type='text/javascript' src='js/views/moderators_remove_dialog_view.js'></script>
   <script type='text/javascript' src='js/views/user_details_dialog_view.js'></script>
-  <script type='text/javascript' src='js/views/nickname_dialog_view.js'></script>
   <script type='text/javascript' src='js/views/password_dialog_view.js'></script>
   <script type='text/javascript' src='js/views/seed_dialog_view.js'></script>
 
   <!-- CRYPTO -->
   <script type='text/javascript' src='js/wall_clock_listener.js'></script>
 </head>
+
 <body>
   <div class='app-loading-screen'>
     <div class="content session-full-logo">
@@ -187,4 +187,5 @@
 
   <script type='text/javascript' src='js/background.js'></script>
 </body>
-</html>
+
+</html>
\ No newline at end of file
diff --git a/js/background.js b/js/background.js
index dd3d523c6..9e3e23e6d 100644
--- a/js/background.js
+++ b/js/background.js
@@ -745,12 +745,6 @@
       }
     });
 
-    Whisper.events.on('showNicknameDialog', options => {
-      if (appView) {
-        appView.showNicknameDialog(options);
-      }
-    });
-
     Whisper.events.on('showSeedDialog', async () => {
       if (appView) {
         appView.showSeedDialog();
diff --git a/js/views/app_view.js b/js/views/app_view.js
index d6873199a..616e343dc 100644
--- a/js/views/app_view.js
+++ b/js/views/app_view.js
@@ -131,20 +131,6 @@
       const dialog = new Whisper.UserDetailsDialogView(options);
       this.el.prepend(dialog.el);
     },
-    showNicknameDialog({ pubKey, title, message, nickname, onOk, onCancel }) {
-      const _title = title || `Change nickname for ${pubKey}`;
-
-      const dialog = new Whisper.NicknameDialogView({
-        title: _title,
-        message,
-        name: nickname,
-        resolve: onOk,
-        reject: onCancel,
-        theme: this.getThemeObject(),
-      });
-      this.el.prepend(dialog.el);
-      dialog.focusInput();
-    },
     showPasswordDialog(options) {
       // eslint-disable-next-line no-param-reassign
       options.theme = this.getThemeObject();
diff --git a/js/views/nickname_dialog_view.js b/js/views/nickname_dialog_view.js
deleted file mode 100644
index 398ec3c41..000000000
--- a/js/views/nickname_dialog_view.js
+++ /dev/null
@@ -1,108 +0,0 @@
-/* global Whisper, i18n, _, displayNameRegex */
-
-// eslint-disable-next-line func-names
-(function() {
-  'use strict';
-
-  window.Whisper = window.Whisper || {};
-
-  Whisper.NicknameDialogView = Whisper.View.extend({
-    className: 'loki-dialog nickname-dialog modal',
-    templateName: 'nickname-dialog',
-    initialize(options) {
-      this.message = options.message;
-      this.name = options.name || '';
-
-      this.resolve = options.resolve;
-      this.okText = options.okText || i18n('ok');
-
-      this.reject = options.reject;
-      this.cancelText = options.cancelText || i18n('cancel');
-
-      this.title = options.title;
-
-      this.render();
-
-      this.$input = this.$('input');
-      this.$input.val(this.name);
-      this.$input.focus();
-
-      this.validateNickname();
-
-      const sanitiseNameInput = () => {
-        const oldVal = this.$input.val();
-        this.$input.val(oldVal.replace(displayNameRegex, ''));
-      };
-
-      this.$input[0].oninput = () => {
-        sanitiseNameInput();
-      };
-
-      this.$input[0].onpaste = () => {
-        // Sanitise data immediately after paste because it's easier
-        setTimeout(() => {
-          sanitiseNameInput();
-        });
-      };
-    },
-    events: {
-      keyup: 'onKeyup',
-      'click .ok': 'ok',
-      'click .cancel': 'cancel',
-      change: 'validateNickname',
-    },
-    validateNickname() {
-      const nickname = this.$input.val();
-
-      if (_.isEmpty(nickname)) {
-        this.$('.ok').attr('disabled', 'disabled');
-        return false;
-      }
-      this.$('.ok').removeAttr('disabled');
-      return true;
-    },
-    render_attributes() {
-      return {
-        message: this.message,
-        showCancel: !this.hideCancel,
-        cancel: this.cancelText,
-        ok: this.okText,
-        title: this.title,
-      };
-    },
-    ok() {
-      const nickname = this.$input.val().trim();
-
-      this.remove();
-      if (this.resolve) {
-        this.resolve(nickname);
-      }
-    },
-    cancel() {
-      this.remove();
-      if (this.reject) {
-        this.reject();
-      }
-    },
-    onKeyup(event) {
-      const valid = this.validateNickname();
-      switch (event.key) {
-        case 'Enter':
-          if (valid) {
-            this.ok();
-          }
-          break;
-        case 'Escape':
-        case 'Esc':
-          this.cancel();
-          break;
-        default:
-          return;
-      }
-      event.preventDefault();
-    },
-    focusInput() {
-      this.$input.focus();
-    },
-  });
-})();
diff --git a/test/index.html b/test/index.html
index 83d54ad1d..2b3c81d3d 100644
--- a/test/index.html
+++ b/test/index.html
@@ -6,6 +6,7 @@
   <link rel="stylesheet" href="../node_modules/mocha/mocha.css" />
   <link rel="stylesheet" href="../stylesheets/manifest.css" />
 </head>
+
 <body>
   <div id="mocha">
   </div>
@@ -196,7 +197,7 @@
   <script type="text/javascript" src="../js/views/app_view.js"></script>
   <script type="text/javascript" src="../js/views/import_view.js"></script>
 
-    <!-- DIALOGS-->
+  <!-- DIALOGS-->
 
   <script type="text/javascript" src="../js/views/update_group_dialog_view.js"></script>
   <script type="text/javascript" src="../js/views/edit_profile_dialog_view.js"></script>
@@ -206,7 +207,6 @@
   <script type="text/javascript" src="../js/views/moderators_add_dialog_view.js"></script>
   <script type="text/javascript" src="../js/views/moderators_remove_dialog_view.js"></script>
   <script type="text/javascript" src="../js/views/user_details_dialog_view.js"></script>
-  <script type="text/javascript" src="../js/views/nickname_dialog_view.js"></script>
   <script type="text/javascript" src="../js/views/password_dialog_view.js"></script>
   <script type="text/javascript" src="../js/views/seed_dialog_view.js"></script>
 
@@ -233,4 +233,5 @@
     mocha.run();
   </script>
 </body>
-</html>
+
+</html>
\ No newline at end of file
diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index a5edbd13d..92bed6108 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -1366,11 +1366,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
   }
 
   public changeNickname() {
-    window.Whisper.events.trigger('showNicknameDialog', {
-      pubKey: this.id,
-      nickname: this.getNickname(),
-      onOk: (newName: string) => this.setNickname(newName),
-    });
+    throw new Error('changeNickname todo');
   }
 
   public deleteContact() {
