diff --git a/packages/autoupdate/autoupdate_client.js b/packages/autoupdate/autoupdate_client.js
index d25de33440..bdc3e31e0d 100644
--- a/packages/autoupdate/autoupdate_client.js
+++ b/packages/autoupdate/autoupdate_client.js
@@ -78,8 +78,7 @@ Autoupdate._retrySubscription = function () {
       if (Package.reload) {
         var checkNewVersionDocument = function (id, fields) {
           var self = this;
-          var isRefreshable = id === 'version-refreshable';
-          if (isRefreshable &&
+          if (id === 'version-refreshable' &&
               fields.version !== autoupdateVersionRefreshable) {
             autoupdateVersionRefreshable = fields.version;
             // Switch out old css links for the new css links. Inspired by:
@@ -131,7 +130,7 @@ Autoupdate._retrySubscription = function () {
               attachStylesheetLink(newLink);
             });
           }
-          else if (! isRefreshable &&
+          else if (id === 'version' &&
                    fields.version !== autoupdateVersion && handle) {
             handle.stop();
             Package.reload.Reload._reload();
diff --git a/packages/autoupdate/autoupdate_server.js b/packages/autoupdate/autoupdate_server.js
index 56de4ea266..202040a400 100644
--- a/packages/autoupdate/autoupdate_server.js
+++ b/packages/autoupdate/autoupdate_server.js
@@ -116,9 +116,7 @@ Meteor.startup(function () {
   // Allow people to override Autoupdate.autoupdateVersion before startup.
   // Tests do this.
   startupVersion = Autoupdate.autoupdateVersion;
-  WebApp.onListening(function () {
-    updateVersions(false);
-  });
+  updateVersions(false);
 });
 
 Meteor.publish(
@@ -132,4 +130,4 @@ Meteor.publish(
 // Listen for SIGUSR2, which signals that a client asset has changed.
 process.on('SIGUSR2', Meteor.bindEnvironment(function () {
   updateVersions(true);
-}));
\ No newline at end of file
+}));