diff --git a/gns3server/controller/compute.py b/gns3server/controller/compute.py
index 6e8bb744..e1fbd573 100644
--- a/gns3server/controller/compute.py
+++ b/gns3server/controller/compute.py
@@ -538,7 +538,10 @@ class Compute:
         """
         Forward a call to the emulator on compute
         """
-        res = yield from self.http_query(method, "/{}/{}".format(type, path), data=data, timeout=None)
+        try:
+            res = yield from self.http_query(method, "/{}/{}".format(type, path), data=data, timeout=None)
+        except aiohttp.errors.DisconnectedError:
+            raise aiohttp.web.HTTPGatewayTimeout()
         return res.json
 
     @asyncio.coroutine