diff --git a/src/jrd/optimizer/Optimizer.h b/src/jrd/optimizer/Optimizer.h
index 02187df567..36c4a00a9e 100644
--- a/src/jrd/optimizer/Optimizer.h
+++ b/src/jrd/optimizer/Optimizer.h
@@ -844,7 +844,7 @@ class InnerJoin : private Firebird::PermanentStorage
 
 	struct JoinedStreamInfo
 	{
-		static const unsigned MAX_EQUI_MATCHES = 4;
+		static const unsigned MAX_EQUI_MATCHES = 8;
 
 		void reset (StreamType num)
 		{