diff --git a/src/modules/module-client-node/client-node.c b/src/modules/module-client-node/client-node.c
index 3c6d6e4d8..134511b35 100644
--- a/src/modules/module-client-node/client-node.c
+++ b/src/modules/module-client-node/client-node.c
@@ -30,7 +30,7 @@ PW_LOG_TOPIC_EXTERN(mod_topic);
 
 #define MAX_BUFFERS	64
 #define MAX_METAS	16u
-#define MAX_DATAS	64u
+#define MAX_DATAS	256u
 #define AREA_SLOT	(sizeof(struct spa_io_async_buffers))
 #define AREA_SIZE	(4096u / AREA_SLOT)
 #define MAX_AREAS	32
diff --git a/src/modules/module-client-node/protocol-native.c b/src/modules/module-client-node/protocol-native.c
index 3051703af..17f8e2da1 100644
--- a/src/modules/module-client-node/protocol-native.c
+++ b/src/modules/module-client-node/protocol-native.c
@@ -18,7 +18,7 @@
 #define MAX_PARAM_INFO	128
 #define MAX_BUFFERS	64
 #define MAX_METAS	16u
-#define MAX_DATAS	64u
+#define MAX_DATAS	256u
 
 PW_LOG_TOPIC_EXTERN(mod_topic);
 #define PW_LOG_TOPIC_DEFAULT mod_topic
diff --git a/src/pipewire/buffers.c b/src/pipewire/buffers.c
index e73adaaec..bef597a06 100644
--- a/src/pipewire/buffers.c
+++ b/src/pipewire/buffers.c
@@ -16,8 +16,8 @@
 PW_LOG_TOPIC_EXTERN(log_buffers);
 #define PW_LOG_TOPIC_DEFAULT log_buffers
 
-#define MAX_ALIGN	32
-#define MAX_BLOCKS	64u
+#define MAX_ALIGN	32u
+#define MAX_BLOCKS	256u
 
 struct port {
 	struct spa_node *node;
diff --git a/src/pipewire/filter.c b/src/pipewire/filter.c
index 519c1e2f7..c4130322a 100644
--- a/src/pipewire/filter.c
+++ b/src/pipewire/filter.c
@@ -26,7 +26,7 @@
 PW_LOG_TOPIC_EXTERN(log_filter);
 #define PW_LOG_TOPIC_DEFAULT log_filter
 
-#define MAX_BUFFERS	64
+#define MAX_BUFFERS	64u
 
 #define MASK_BUFFERS	(MAX_BUFFERS-1)