diff --git a/src/octoprint/static/js/app/dataupdater.js b/src/octoprint/static/js/app/dataupdater.js
index d547a16c..4172b459 100644
--- a/src/octoprint/static/js/app/dataupdater.js
+++ b/src/octoprint/static/js/app/dataupdater.js
@@ -22,6 +22,7 @@ function DataUpdater(allViewModels) {
     };
 
     self.reconnect = function() {
+        self._socket.close();
         delete self._socket;
         self.connect();
     };
@@ -31,7 +32,11 @@ function DataUpdater(allViewModels) {
         self._autoReconnectTrial = 0;
     };
 
-    self._onclose = function() {
+    self._onclose = function(e) {
+        if (e.code == 1000) {
+            // it was us calling close
+            return;
+        }
         if (self._autoReconnectTrial >= self._autoReconnectDialogIndex) {
             // Only consider it a real disconnect if the trial number has exceeded our threshold.