diff --git a/libtextsecure/account_manager.js b/libtextsecure/account_manager.js
index 38915de28..102fae03a 100644
--- a/libtextsecure/account_manager.js
+++ b/libtextsecure/account_manager.js
@@ -47,6 +47,9 @@
       return this.server.requestVerificationSMS(number);
     },
     async encryptDeviceName(name, providedIdentityKey) {
+      if (!name) {
+        return null;
+      }
       const identityKey =
         providedIdentityKey ||
         (await textsecure.storage.protocol.getIdentityKeyPair());
diff --git a/libtextsecure/test/account_manager_test.js b/libtextsecure/test/account_manager_test.js
index f1e98827d..7f70ea08d 100644
--- a/libtextsecure/test/account_manager_test.js
+++ b/libtextsecure/test/account_manager_test.js
@@ -38,6 +38,11 @@ describe('AccountManager', () => {
 
         assert.strictEqual(decrypted, deviceName);
       });
+
+      it('handles null deviceName', async () => {
+        const encrypted = await accountManager.encryptDeviceName(null);
+        assert.strictEqual(encrypted, null);
+      });
     });
 
     it('keeps three confirmed keys even if over a week old', () => {