diff --git a/CHANGELOG.md b/CHANGELOG.md
index a9b7e891c6..932aa537d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -50,6 +50,7 @@ CHANGELOG
 * @mmcc fixed the progress handle transition jerkiness ([view](https://github.com/videojs/video.js/pull/2219))
 * @dmlap added support for the seekable property ([view](https://github.com/videojs/video.js/pull/2208))
 * @mmcc un-hid the current and remaining times by default ([view](https://github.com/videojs/video.js/pull/2241))
+* @pavelhoral fixed a bug with user activity that caused the control bar to flicker ([view](https://github.com/videojs/video.js/pull/2299))
 
 --------------------
 
diff --git a/src/js/player.js b/src/js/player.js
index efc34d35ce..7dfa4f6d46 100644
--- a/src/js/player.js
+++ b/src/js/player.js
@@ -1919,9 +1919,8 @@ class Player extends Component {
     // `this.reportUserActivity` simply sets this.userActivity_ to true, which
     // then gets picked up by this loop
     // http://ejohn.org/blog/learning-from-twitter/
+    let inactivityTimeout;
     let activityCheck = this.setInterval(function() {
-      let inactivityTimeout;
-
       // Check to see if mouse/touch activity has happened
       if (this.userActivity_) {
         // Reset the activity tracker