diff --git a/source/Irrlicht/COpenGLCoreTexture.h b/source/Irrlicht/COpenGLCoreTexture.h
index 38380156..32ff0cb0 100644
--- a/source/Irrlicht/COpenGLCoreTexture.h
+++ b/source/Irrlicht/COpenGLCoreTexture.h
@@ -104,8 +104,6 @@ public:
 		for (u32 i = 0; i < (*tmpImage).size(); ++i)
 			uploadTexture(true, i, 0, (*tmpImage)[i]->getData());
 
-		Driver->getCacheHandler()->getTextureCache().set(0, prevTexture);
-
 		bool autoGenerateRequired = true;
 
 		for (u32 i = 0; i < (*tmpImage).size(); ++i)
@@ -127,6 +125,9 @@ public:
 			Image.clear();
 		}
 
+
+		Driver->getCacheHandler()->getTextureCache().set(0, prevTexture);
+
 		Driver->testGLError(__LINE__);
 	}