diff --git a/src/DepthBuffer.cpp b/src/DepthBuffer.cpp
index 0991652e..8f691891 100644
--- a/src/DepthBuffer.cpp
+++ b/src/DepthBuffer.cpp
@@ -165,10 +165,10 @@ void DepthBuffer::_initDepthBufferTexture(FrameBuffer * _pBuffer, CachedTexture
 		gfxContext.init2DTexture(params);
 	}
 	_pTexture->frameBufferTexture = _multisample ? CachedTexture::fbMultiSample : CachedTexture::fbOneSample;
-	{
+	if (!_multisample) {
 		Context::TexParameters params;
 		params.handle = _pTexture->name;
-		params.target = _multisample ? textureTarget::TEXTURE_2D_MULTISAMPLE : textureTarget::TEXTURE_2D;
+		params.target = textureTarget::TEXTURE_2D;
 		params.textureUnitIndex = textureIndices::Tex[0];
 		params.minFilter = textureParameters::FILTER_NEAREST;
 		params.magFilter = textureParameters::FILTER_NEAREST;
diff --git a/src/FrameBuffer.cpp b/src/FrameBuffer.cpp
index 8aad8aca..802ff116 100644
--- a/src/FrameBuffer.cpp
+++ b/src/FrameBuffer.cpp
@@ -106,10 +106,10 @@ void FrameBuffer::_setAndAttachTexture(ObjectHandle _fbo, CachedTexture *_pTextu
 		}
 		gfxContext.init2DTexture(params);
 	}
-	{
+	if (!_multisampling) {
 		Context::TexParameters params;
 		params.handle = _pTexture->name;
-		params.target = _multisampling ? textureTarget::TEXTURE_2D_MULTISAMPLE : textureTarget::TEXTURE_2D;
+		params.target = textureTarget::TEXTURE_2D;
 		params.textureUnitIndex = textureIndices::Tex[_t];
 		params.minFilter = textureParameters::FILTER_NEAREST;
 		params.magFilter = textureParameters::FILTER_NEAREST;
diff --git a/src/Textures.cpp b/src/Textures.cpp
index 61661ff6..654ce82e 100644
--- a/src/Textures.cpp
+++ b/src/Textures.cpp
@@ -1497,8 +1497,6 @@ void TextureCache::activateMSDummy(u32 _t)
 	params.handle = m_pMSDummy->name;
 	params.target = textureTarget::TEXTURE_2D_MULTISAMPLE;
 	params.textureUnitIndex = textureIndices::MSTex[_t];
-	params.minFilter = textureParameters::FILTER_NEAREST;
-	params.magFilter = textureParameters::FILTER_NEAREST;
 	gfxContext.setTextureParameters(params);
 }