diff --git a/src/app/index.coffee b/src/app/index.coffee
index f9c4ef3e17..3db4854213 100644
--- a/src/app/index.coffee
+++ b/src/app/index.coffee
@@ -52,9 +52,9 @@ get '/', (page, model, next) ->
     character.updateUser(batch)
     batch.commit()
 
-    browser.restoreRefs model
-
-    party.partySubscribe model, -> page.render()
+    party.partySubscribe model, ->
+      browser.restoreRefs model
+      page.render()
 
 # ========== CONTROLLER FUNCTIONS ==========
 
diff --git a/src/app/party.coffee b/src/app/party.coffee
index 81fac2cc11..853e62412b 100644
--- a/src/app/party.coffee
+++ b/src/app/party.coffee
@@ -8,8 +8,8 @@ membersQ = null
 partyUnsubscribe = (model, cb) ->
   if window?
     subs = model._subs()
+    subs.concat cb if cb?
     model.unsubscribe.apply(model, subs)
-    cb() if cb?
 
 module.exports.partySubscribe = partySubscribe = (model, cb) ->