diff --git a/lib/OpenLayers/Layer/Grid.js b/lib/OpenLayers/Layer/Grid.js
index eba00f5e4d..df9bafe49e 100644
--- a/lib/OpenLayers/Layer/Grid.js
+++ b/lib/OpenLayers/Layer/Grid.js
@@ -285,14 +285,12 @@ OpenLayers.Layer.Grid = OpenLayers.Class(OpenLayers.Layer.HTTPRequest, {
                     // an ill-positioned image will be visible during the zoom
                     // transition.
 
-                    if(lastResolution !== serverResolution &&
-                               this.transitionEffect !== 'resize') {
+                    if(zoomChanged && this.transitionEffect !== 'resize') {
                         this.removeBackBuffer();
                     }
 
-                    if(lastResolution === serverResolution ||
-                       (lastResolution &&
-                        this.transitionEffect === 'resize')) {
+                    if(!zoomChanged || (lastResolution &&
+                                        this.transitionEffect === 'resize')) {
                         this.applyBackBuffer(serverResolution);
                     }
 
@@ -325,9 +323,8 @@ OpenLayers.Layer.Grid = OpenLayers.Class(OpenLayers.Layer.HTTPRequest, {
                 }
 
                 if(forceReTile) {
-                    if(this.transitionEffect === 'resize' &&
-                       (lastResolution &&
-                        (lastResolution !== serverResolution))) {
+                    if(zoomChanged && this.transitionEffect === 'resize' &&
+                       lastResolution) {
                         this.applyBackBuffer(serverResolution);
                     }
                     this.initGriddedTiles(bounds);