4 files changed, 8 insertions, 6 deletions
diff --git a/app/lib/backend.js b/app/lib/backend.js
index 2702c6a34a..6aec66e208 100644
--- a/app/lib/backend.js
+++ b/app/lib/backend.js
@@ -212,7 +212,7 @@ export class Backend {
 
   logout() {
     // @TODO: What does it mean for a logout to be successful or failed?
-    this._ipc.setAccount('')
+    this._ipc.setAccount(null)
       .then(() => {
 
         this._store.dispatch(accountActions.loggedOut());
diff --git a/app/lib/ipc-facade.js b/app/lib/ipc-facade.js
index 736d4fc31c..29c369dd9b 100644
--- a/app/lib/ipc-facade.js
+++ b/app/lib/ipc-facade.js
@@ -36,7 +36,7 @@ export interface IpcFacade {
   setConnectionString(string): void,
   getAccountData(AccountToken): Promise<AccountData>,
   getAccount(): Promise<?AccountToken>,
-  setAccount(accountToken: AccountToken): Promise<void>,
+  setAccount(accountToken: ?AccountToken): Promise<void>,
   setCustomRelay(RelayEndpoint): Promise<void>,
   connect(): Promise<void>,
   disconnect(): Promise<void>,
@@ -83,7 +83,7 @@ export class RealIpc implements IpcFacade {
       });
   }
 
-  setAccount(accountToken: AccountToken): Promise<void> {
+  setAccount(accountToken: ?AccountToken): Promise<void> {
     return this._ipc.send('set_account', accountToken)
       .then(this._ignoreResponse);
   }
diff --git a/app/lib/jsonrpc-ws-ipc.js b/app/lib/jsonrpc-ws-ipc.js
index 89ccc0c44e..2609d1514c 100644
--- a/app/lib/jsonrpc-ws-ipc.js
+++ b/app/lib/jsonrpc-ws-ipc.js
@@ -138,8 +138,10 @@ export default class Ipc {
     // this isn't very nice to use, so this method wraps other
     // types in an array. The choice of array is based on try-and-error
 
-    if(data === undefined || data === null) {
+    if(data === undefined) {
       return [];
+    } else if (data === null) {
+      return [null];
     } else if (Array.isArray(data) || typeof(data) === 'object') {
       return data;
     } else {
diff --git a/test/logout.spec.js b/test/logout.spec.js
index 9b44f83ca6..0e295aef9b 100644
--- a/test/logout.spec.js
+++ b/test/logout.spec.js
@@ -7,13 +7,13 @@ import accountActions from '../app/redux/account/actions';
 
 describe('logging out', () => {
 
-  it('should set the account to the empty string and then disconnect', (done) => {
+  it('should set the account to null and then disconnect', (done) => {
     const { mockIpc, backend } = setupBackendAndStore();
 
     const chain = new IpcChain(mockIpc);
     chain.require('setAccount')
       .withInputValidation((num) => {
-        expect(num).to.equal('');
+        expect(num).to.be.null;
       })
       .done();
     chain.require('disconnect')