diff --git a/libs/gfx/source/program.cpp b/libs/gfx/source/program.cpp
index 7094d25d..b4bd4feb 100644
--- a/libs/gfx/source/program.cpp
+++ b/libs/gfx/source/program.cpp
@@ -407,12 +407,13 @@ namespace psemek::gfx
 
 	void program::uniform_block_binding(std::string_view name, GLuint binding) const
 	{
-		gl::UniformBlockBinding(program_, uniform_block_index(name), binding);
+		uniform_block_binding(uniform_block_index(name), binding);
 	}
 
 	void program::uniform_block_binding(GLuint index, GLuint binding) const
 	{
-		gl::UniformBlockBinding(program_, index, binding);
+		if (index != gl::INVALID_INDEX)
+			gl::UniformBlockBinding(program_, index, binding);
 	}
 
 }