diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index 6fabacfa..88d960d8 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -112,7 +112,7 @@ bgp_create_update(struct bgp_conn *conn, byte *buf)
 	  break;
 	}
     }
-  else
+  if (!a_size)				/* Attributes not already encoded */
     {
       put_u16(w, 0);
       w += 2;