diff --git a/rpcs3/Emu/RSX/GL/GLGSRender.cpp b/rpcs3/Emu/RSX/GL/GLGSRender.cpp
index b06dde3af6..998e1c8943 100644
--- a/rpcs3/Emu/RSX/GL/GLGSRender.cpp
+++ b/rpcs3/Emu/RSX/GL/GLGSRender.cpp
@@ -583,6 +583,13 @@ void GLGSRender::end()
 	glEnableVertexAttribArray(0);
 	glVertexAttribPointer(0, 2, GL_FLOAT, false, 0, 0);
 
+	/**
+	 * Validate fails if called right after linking a program because the VS and FS both use textures bound using different
+	 * samplers. So far only sampler2D has been largely used, hiding the problem. This call shall also degrade performance further
+	 * if used every draw call. Fixes shader validation issues on AMD.
+	 */
+	m_program->validate();
+
 	if (draw_command == rsx::draw_command::indexed)
 	{
 		m_ebo.data(vertex_index_array.size(), vertex_index_array.data());
diff --git a/rpcs3/Emu/RSX/GL/gl_helpers.h b/rpcs3/Emu/RSX/GL/gl_helpers.h
index 7e7c121930..73b78b77a7 100644
--- a/rpcs3/Emu/RSX/GL/gl_helpers.h
+++ b/rpcs3/Emu/RSX/GL/gl_helpers.h
@@ -2096,7 +2096,6 @@ namespace gl
 			void make()
 			{
 				link();
-				validate();
 			}
 
 			uint id() const