diff --git a/tuskar_ui/api.py b/tuskar_ui/api.py
index 6539d8b6d..b068c257c 100644
--- a/tuskar_ui/api.py
+++ b/tuskar_ui/api.py
@@ -475,6 +475,11 @@ class Overcloud(base.APIResourceWrapper):
                                                         self.stack.stack_name)]
         except heatclient.exc.HTTPNotFound:
             resources = []
+        except heatclient.exc.HTTPInternalServerError:
+            # TODO(lsmola) There is a weird bug in heat, that after
+            # stack-create it returns 500 for a little while. This can be
+            # removed once the bug is fixed.
+            resources = []
 
         if not with_joins:
             return [Resource(r, request=self._request) for r in resources]