diff --git a/doc/SPOE.txt b/doc/SPOE.txt
index 1ad4f3792..1012f3517 100644
--- a/doc/SPOE.txt
+++ b/doc/SPOE.txt
@@ -157,6 +157,7 @@ spoe-agent <name>
 
   following keywords are supported :
     - messages
+    - option continue-on-error
     - option var-prefix
     - timeout hello|idle|processing
     - use-backend
@@ -175,6 +176,19 @@ messages <msg-name> ...
   See also: "spoe-message" section.
 
 
+option continue-on-error
+  Do not stop the events processing when an error occurred on a stream.
+
+  By default, for a specific stream, when an abnormal/unexpected error occurs,
+  the SPOE is disabled for all the transaction. So if you have several events
+  configured, such error on an event will disabled all followings. For TCP
+  streams, this will disable the SPOE for the whole session. For HTTP streams,
+  this will disable it for the transaction (request and response).
+
+  When set, this option bypass this behaviour and only the current event will
+  be ignored.
+
+
 option var-prefix <prefix>
   Define the prefix used when variables are set by an agent.
 
@@ -832,12 +846,13 @@ Here is the list of all known errors:
 
 An agent can define its own errors using a not yet assigned status code.
 
-IMPORTANT NOTE: For a specific stream, when an abnormal/unexpected error
-                occurs, the SPOE is disabled for all the transaction. So if you
-                have several events configured, such error on an event will
-                disabled all followings. For TCP streams, this will disable the
-                SPOE for the whole session. For HTTP streams, this will disable
-                it for the transaction (request and response).
+IMPORTANT NOTE: By default, for a specific stream, when an abnormal/unexpected
+                error occurs, the SPOE is disabled for all the transaction. So
+                if you have several events configured, such error on an event
+                will disabled all followings. For TCP streams, this will
+                disable the SPOE for the whole session. For HTTP streams, this
+                will disable it for the transaction (request and response).
+                See 'option continue-on-error' to bypass this limitation.
 
 To avoid a stream to wait infinitly, you must carefully choose the
 acknowledgement timeout. In most of cases, it will be quiet low. But it depends
diff --git a/src/flt_spoe.c b/src/flt_spoe.c
index 436177338..06d6e5d25 100644
--- a/src/flt_spoe.c
+++ b/src/flt_spoe.c
@@ -61,6 +61,9 @@
 /* Minimal size for a frame */
 #define MIN_FRAME_SIZE 256
 
+/* Flags set on the SPOE agent */
+#define SPOE_FL_CONT_ON_ERR       0x00000001 /* Do not stop events processing when an error occurred */
+
 /* Flags set on the SPOE context */
 #define SPOE_CTX_FL_CLI_CONNECTED 0x00000001 /* Set after that on-client-session event was processed */
 #define SPOE_CTX_FL_SRV_CONNECTED 0x00000002 /* Set after that on-server-session event was processed */
@@ -196,6 +199,7 @@ struct spoe_agent {
 	} timeout;
 
 	char                 *var_pfx;        /* Prefix used for vars set by the agent */
+	unsigned int          flags;          /* SPOE_FL_* */
 
 	struct list           cache;          /* List used to cache SPOE streams. In
 					       * fact, we cache the SPOE applect ctx */
@@ -2178,7 +2182,9 @@ process_spoe_event(struct stream *s, struct spoe_context *ctx,
 
   error:
 	release_spoe_appctx(ctx);
-	ctx->state = SPOE_CTX_ST_ERROR;
+	ctx->state = ((agent->flags & SPOE_FL_CONT_ON_ERR)
+		      ? SPOE_CTX_ST_READY
+		      : SPOE_CTX_ST_ERROR);
 	return 1;
 }
 
@@ -2629,6 +2635,7 @@ cfg_parse_spoe_agent(const char *file, int linenum, char **args, int kwm)
 		curagent->timeout.idle    = TICK_ETERNITY;
 		curagent->timeout.processing = TICK_ETERNITY;
 		curagent->var_pfx         = NULL;
+		curagent->flags           = 0;
 		curagent->new_applets     = 0;
 
 		for (i = 0; i < SPOE_EV_EVENTS; ++i)
@@ -2749,6 +2756,15 @@ cfg_parse_spoe_agent(const char *file, int linenum, char **args, int kwm)
 			}
 			curagent->var_pfx = strdup(args[2]);
 		}
+		else if (!strcmp(args[1], "continue-on-error")) {
+			if (*args[2]) {
+				Alert("parsing [%s:%d] : cannot handle unexpected argument '%s'.\n",
+				      file, linenum, args[3]);
+				err_code |= ERR_ALERT | ERR_ABORT;
+				goto out;
+			}
+			curagent->flags |= SPOE_FL_CONT_ON_ERR;
+		}
 		else {
 			Alert("parsing [%s:%d]: option '%s' is not supported.\n",
 			      file, linenum, args[1]);