diff --git a/ref/gl/gl_image.c b/ref/gl/gl_image.c
index fca08dc3..5d6c7b18 100644
--- a/ref/gl/gl_image.c
+++ b/ref/gl/gl_image.c
@@ -1418,7 +1418,7 @@ static gl_texture_t *GL_AllocTexture( const char *name, texFlags_t flags )
 	// copy initial params
 	Q_strncpy( tex->name, name, sizeof( tex->name ));
 
-	if( FBitSet( flags, TF_SKYSIDE ))
+	if( FBitSet( flags, TF_SKYSIDE ) && glConfig.context != CONTEXT_TYPE_GL_CORE )
 		tex->texnum = tr.skyboxbasenum++;
 	else
 	{
diff --git a/ref/gl/gl_warp.c b/ref/gl/gl_warp.c
index f91b50ba..30dbe1b9 100644
--- a/ref/gl/gl_warp.c
+++ b/ref/gl/gl_warp.c
@@ -761,11 +761,8 @@ void EmitWaterPolys( msurface_t *warp, qboolean reverse )
 	float	s, t, os, ot;
 	glpoly_t	*p;
 	int	i;
-#ifndef XASH_GLES
-	const qboolean useQuads = FBitSet( warp->flags, SURF_DRAWTURB_QUADS );
-#else
-	const qboolean useQuads = false; // TODO: figure out why
-#endif
+
+	const qboolean useQuads = FBitSet( warp->flags, SURF_DRAWTURB_QUADS ) && glConfig.context == CONTEXT_TYPE_GL;
 
 	if( !warp->polys ) return;