diff --git a/app/lib/surface/Surface.coffee b/app/lib/surface/Surface.coffee
index 3a608a045..78a8f4c39 100644
--- a/app/lib/surface/Surface.coffee
+++ b/app/lib/surface/Surface.coffee
@@ -142,10 +142,8 @@ module.exports = Surface = class Surface extends CocoClass
 
   setWorld: (@world) ->
     @worldLoaded = true
-    lastFrame = Math.min(@getCurrentFrame(), @world.frames.length - 1)
-    @world.getFrame(lastFrame).restoreState() unless @options.choosing
     @spriteBoss.world = @world
-
+    @restoreWorldState() unless @options.choosing
     @showLevel()
     @updateState true if @loaded
     @onFrameChanged()