diff --git a/engine/common/host.c b/engine/common/host.c
index e117abb5..40f49847 100644
--- a/engine/common/host.c
+++ b/engine/common/host.c
@@ -819,9 +819,6 @@ void Host_InitCommon( int argc, char **argv, const char *progname, qboolean bCha
 		host.type = HOST_DEDICATED;
 	}
 	SDL_SetHint(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, "0");
-#if defined XASH_GLES && !defined __EMSCRIPTEN__ && !TARGET_OS_IOS
-	SDL_SetHint( SDL_HINT_OPENGL_ES_DRIVER, "1" );
-#endif
 
 	SDL_StopTextInput();
 #endif
diff --git a/engine/platform/sdl/vid_sdl.c b/engine/platform/sdl/vid_sdl.c
index a602c326..4a5d5560 100644
--- a/engine/platform/sdl/vid_sdl.c
+++ b/engine/platform/sdl/vid_sdl.c
@@ -501,6 +501,16 @@ void GL_SwapBuffers()
 
 int GL_SetAttribute( int attr, int val )
 {
+	switch( attr )
+	{
+	case REF_GL_CONTEXT_PROFILE_MASK:
+		if( val == REF_GL_CONTEXT_PROFILE_ES )
+			SDL_SetHint( SDL_HINT_OPENGL_ES_DRIVER, "1" );
+		break;
+	default:
+		break;
+	}
+
 	return SDL_GL_SetAttribute( (SDL_GLattr)attr, val );
 }