diff --git a/source3/smbd/aio.c b/source3/smbd/aio.c
index 44d771e..9d0f9e3 100644
--- a/source3/smbd/aio.c
+++ b/source3/smbd/aio.c
@@ -186,7 +186,8 @@ NTSTATUS schedule_aio_read_and_X(connection_struct *conn,
 		return NT_STATUS_RETRY;
 	}
 
-	if (outstanding_aio_calls >= aio_pending_size) {
+	if (aio_pending_size != 0 &&
+			outstanding_aio_calls >= aio_pending_size) {
 		DEBUG(10,("schedule_aio_read_and_X: Already have %d aio "
 			  "activities outstanding.\n",
 			  outstanding_aio_calls ));
@@ -449,7 +450,8 @@ NTSTATUS schedule_aio_write_and_X(connection_struct *conn,
 		return NT_STATUS_RETRY;
 	}
 
-	if (outstanding_aio_calls >= aio_pending_size) {
+	if (aio_pending_size != 0 &&
+			outstanding_aio_calls >= aio_pending_size) {
 		DEBUG(3,("schedule_aio_write_and_X: Already have %d aio "
 			 "activities outstanding.\n",
 			  outstanding_aio_calls ));
@@ -708,7 +710,8 @@ NTSTATUS schedule_smb2_aio_read(connection_struct *conn,
 		return NT_STATUS_RETRY;
 	}
 
-	if (outstanding_aio_calls >= aio_pending_size) {
+	if (aio_pending_size != 0 &&
+			outstanding_aio_calls >= aio_pending_size) {
 		DEBUG(10,("smb2: Already have %d aio "
 			"activities outstanding.\n",
 			outstanding_aio_calls ));
@@ -864,7 +867,8 @@ NTSTATUS schedule_aio_smb2_write(connection_struct *conn,
 		return NT_STATUS_RETRY;
 	}
 
-	if (outstanding_aio_calls >= aio_pending_size) {
+	if (aio_pending_size != 0 &&
+			outstanding_aio_calls >= aio_pending_size) {
 		DEBUG(3,("smb2: Already have %d aio "
 			"activities outstanding.\n",
 			outstanding_aio_calls ));
diff --git a/source3/smbd/globals.c b/source3/smbd/globals.c
index e03c7c4..65d39d2 100644
--- a/source3/smbd/globals.c
+++ b/source3/smbd/globals.c
@@ -24,7 +24,7 @@
 #include "messages.h"
 #include "tdb_compat.h"
 
-int aio_pending_size = 100;	/* tevent supports 100 signals SA_SIGINFO */
+int aio_pending_size = 0;	/* By default no limits on aio threads. */
 int outstanding_aio_calls = 0;
 
 #ifdef USE_DMAPI