diff --git a/pkg/snet/packet_conn.go b/pkg/snet/packet_conn.go
index 493a125e2e..dc1f07abaf 100644
--- a/pkg/snet/packet_conn.go
+++ b/pkg/snet/packet_conn.go
@@ -263,12 +263,8 @@ func (c *SCIONPacketConn) LocalAddr() net.Addr {
 // comes from *loopback:30041*.
 func (c *SCIONPacketConn) isShimDispatcher(udpAddr *net.UDPAddr) bool {
 	localAddr := c.LocalAddr().(*net.UDPAddr)
-	if udpAddr.IP.Equal(localAddr.IP) ||
-		udpAddr.IP.IsLoopback() &&
-			udpAddr.Port == underlay.EndhostPort {
-		return true
-	}
-	return false
+	return udpAddr.Port == underlay.EndhostPort &&
+		(udpAddr.IP.Equal(localAddr.IP) || udpAddr.IP.IsLoopback())
 }
 
 func (c *SCIONPacketConn) lastHop(p *Packet) (*net.UDPAddr, error) {