diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index 4203844ab8..e3bd2f5d41 100644
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -1895,9 +1895,11 @@ connection_input( Connection *conn )
 			connection_op_queue( op );
 			cri->op = op;
 		} else {
-			cri->nullop = 1;
-			rc = ldap_pvt_thread_pool_submit( &connection_pool,
-				connection_operation, (void *) cri->op );
+			if ( !cri->nullop ) {
+				cri->nullop = 1;
+				rc = ldap_pvt_thread_pool_submit( &connection_pool,
+					connection_operation, (void *) cri->op );
+			}
 			connection_op_activate( op );
 		}
 #else