diff --git a/Apps/CesiumViewer/CesiumViewer.js b/Apps/CesiumViewer/CesiumViewer.js
index 3d61c11f1ba9..8ccac09825bd 100644
--- a/Apps/CesiumViewer/CesiumViewer.js
+++ b/Apps/CesiumViewer/CesiumViewer.js
@@ -176,19 +176,11 @@ define([
         history.replaceState(undefined, '', '?' + objectToQuery(endUserOptions));
     }
 
-    var updateTimer;
+    var timeout;
     if (endUserOptions.saveCamera !== 'false') {
-        camera.moveStart.addEventListener(function() {
-            if (!defined(updateTimer)) {
-                updateTimer = window.setInterval(saveCamera, camera, 1000);
-            }
-        });
-        camera.moveEnd.addEventListener(function() {
-            if (defined(updateTimer)) {
-                window.clearInterval(updateTimer);
-                updateTimer = undefined;
-            }
-            saveCamera(camera);
+        camera.changed.addEventListener(function() {
+            window.clearTimeout(timeout);
+            timeout = window.setTimeout(saveCamera, 1000);
         });
     }
 
diff --git a/CHANGES.md b/CHANGES.md
index 5f479e598c05..47a3a45e686c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,10 @@
 Change Log
 ==========
 
+### 1.37 - 2017-09-01
+
+* Fixed `replaceState` bug that was causing the `CesiumViewer` demo application to crash in Safari and iOS
+
 ### 1.36 - 2017-08-01
 
 * Breaking changes