diff --git a/libtransmission/upnp.c b/libtransmission/upnp.c
index a1348418c..e4151c25b 100644
--- a/libtransmission/upnp.c
+++ b/libtransmission/upnp.c
@@ -679,6 +679,8 @@ devicePulse( tr_upnp_device_t * dev, tr_fd_t * fdlimit, int port )
                 dev->host, dev->state );
         dev->state = UPNPDEV_STATE_ERROR;
         dev->looping = 0;
+        killHttp( fdlimit, &dev->http );
+        return 1;
     }
 
     laststate = dev->state;