diff --git a/src/bgfx.cpp b/src/bgfx.cpp
index 236bce15a..fb248c1e3 100644
--- a/src/bgfx.cpp
+++ b/src/bgfx.cpp
@@ -1325,8 +1325,10 @@ namespace bgfx
 
 		m_draw.clear(_flags);
 		m_bind.clear(_flags);
-
-		m_uniformBegin = m_uniformEnd;
+		if (_flags & BGFX_DISCARD_STATE)
+		{
+			m_uniformBegin = m_uniformEnd;
+		}
 	}
 
 	void EncoderImpl::dispatch(ViewId _id, ProgramHandle _handle, uint32_t _numX, uint32_t _numY, uint32_t _numZ, uint8_t _flags)