diff --git a/src/forward.c b/src/forward.c
index 79acff5..66b8564 100644
--- a/src/forward.c
+++ b/src/forward.c
@@ -817,7 +817,7 @@
 
   /* Note: if we send extra options in the EDNS0 header, we can't recreate
      the query from the reply. */
-  if (RCODE(header) == REFUSED &&
+  if ((RCODE(header) == REFUSED || RCODE(header) == SERVFAIL) &&
       forward->forwardall == 0 &&
       !(forward->flags & FREC_HAS_EXTRADATA))
     /* for broken servers, attempt to send to another one. */