diff --git a/static/js/controllers.js b/static/js/controllers.js
index e0b04e319..171aa3cac 100644
--- a/static/js/controllers.js
+++ b/static/js/controllers.js
@@ -3038,7 +3038,7 @@ function SuperUserAdminCtrl($scope, $timeout, ApiService, Features, UserService,
 
   $scope.checkContainerStatus = function() {
     var errorHandler = function(resp) {
-      if (resp.status == 404 && $scope.configStep == 'valid-database') {
+      if ((resp.status == 404 || resp.status == 502) && $scope.configStep == 'valid-database') {
         // Container has not yet come back up, so we schedule another check.
         $scope.waitForValidConfig();
         return;