diff --git a/kernel/trunk/network/IPv4.inc b/kernel/trunk/network/IPv4.inc
index 2433d7ac63..f17be4eeb6 100644
--- a/kernel/trunk/network/IPv4.inc
+++ b/kernel/trunk/network/IPv4.inc
@@ -939,6 +939,7 @@ ipv4_route:
         test    ebx, ebx
         jnz     .got_device
 
+; Broadcast does not need gateway
         cmp     eax, 0xffffffff
         je      .broadcast
 
@@ -976,6 +977,10 @@ ipv4_route:
 
         mov     edx, [IP_LIST + edi]            ; Source IP
 
+; Broadcast does not need gateway
+        cmp     eax, 0xffffffff
+        je      @f
+
 ; Check if we should route to gateway or not
         mov     ebx, [IP_LIST + edi]
         and     ebx, [SUBNET_LIST + edi]