diff --git a/gns3server/controller/compute.py b/gns3server/controller/compute.py
index 3d6822c8..6a4ac0ce 100644
--- a/gns3server/controller/compute.py
+++ b/gns3server/controller/compute.py
@@ -529,7 +529,7 @@ class Compute:
                 raise aiohttp.web.HTTPForbidden(text=msg)
             elif response.status == 404:
                 raise aiohttp.web.HTTPNotFound(text="{} {} not found".format(method, path))
-            elif response.status == 408:
+            elif response.status == 408 or response.status == 504:
                 raise aiohttp.web.HTTPRequestTimeout(text="{} {} request timeout".format(method, path))
             elif response.status == 409:
                 try: