diff --git a/plexpy/__init__.py b/plexpy/__init__.py
index d5ba9319..01f01988 100644
--- a/plexpy/__init__.py
+++ b/plexpy/__init__.py
@@ -2279,6 +2279,9 @@ def upgrade():
 
 
 def shutdown(restart=False, update=False, checkout=False, reset=False):
+    if FROZEN and common.PLATFORM == 'Windows' and update:
+        restart = False
+
     webstart.stop()
 
     # Shutdown the websocket connection
diff --git a/plexpy/versioncheck.py b/plexpy/versioncheck.py
index 572c5011..f372c258 100644
--- a/plexpy/versioncheck.py
+++ b/plexpy/versioncheck.py
@@ -277,12 +277,9 @@ def check_github(scheduler=False, notify=False, use_cache=False):
         if plexpy.PYTHON2:
             logger.warn('Tautulli is running using Python 2. Unable to run automatic update.')
 
-        elif scheduler and plexpy.FROZEN and common.PLATFORM == 'Windows':
-            logger.info('Running automatic update.')
-            plexpy.shutdown(update=True)
-
         elif scheduler and plexpy.CONFIG.PLEXPY_AUTO_UPDATE and \
-                not plexpy.DOCKER and not plexpy.SNAP and not plexpy.FROZEN:
+                not plexpy.DOCKER and not plexpy.SNAP and \
+                not (plexpy.FROZEN and common.PLATFORM == 'Darwin'):
             logger.info('Running automatic update.')
             plexpy.shutdown(restart=True, update=True)