diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ee754f2e..b5c33b3d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@ CHANGELOG
 =========
 
 ## HEAD (Unreleased)
-_(none)_
+* @vtytar fixed auto-setup failing if taking too long to load ([view](http://github.com/videojs/video.js/pull/3233))
 
 --------------------
 
diff --git a/src/js/setup.js b/src/js/setup.js
index 5e5b9277e..4659624aa 100644
--- a/src/js/setup.js
+++ b/src/js/setup.js
@@ -72,7 +72,10 @@ var autoSetup = function(){
 
 // Pause to let the DOM keep processing
 var autoSetupTimeout = function(wait, vjs){
-  videojs = vjs;
+  if (vjs) {
+    videojs = vjs;
+  }
+
   setTimeout(autoSetup, wait);
 };