diff --git a/octoprint_octolapse/timelapse.py b/octoprint_octolapse/timelapse.py
index fcfa10a5..90736fd2 100644
--- a/octoprint_octolapse/timelapse.py
+++ b/octoprint_octolapse/timelapse.py
@@ -98,8 +98,8 @@ def __init__(
         self._position_signal.set()
 
         # get snapshot async private variables
-        self._snapshot_success = None
-        self._snapshot_timeout = 30.0
+        self._snapshot_success = False
+        self._snapshot_timeout = 600.0
         self._snapshot_signal = threading.Event()
         self._snapshot_signal.set()
         self.CurrentProfiles = {}
@@ -300,16 +300,6 @@ def start_timelapse(
         # take a snapshot of the current settings for use in the Octolapse Tab
         self.CurrentProfiles = self.Settings.get_profiles_dict()
 
-        # fetch position private variables
-        self._position_payload = None
-        self._position_timeout = 30.0
-        self._position_signal.set()
-
-        # get snapshot async private variables
-        self._snapshot_success = None
-        self._snapshot_timeout = 30.0
-        self._snapshot_signal.set()
-
         # send an initial state message
         self._on_timelapse_start()
 
@@ -898,14 +888,9 @@ def _reset(self):
         }
         # fetch position private variables
         self._position_payload = None
-        self._position_timeout = 600.0
-        self._position_signal = threading.Event()
         self._position_signal.set()
 
         # get snapshot async private variables
-        self._snapshot_success = None
-        self._snapshot_timeout = 30.0
-        self._snapshot_signal = threading.Event()
         self._snapshot_signal.set()
 
     def _reset_snapshot(self):