diff --git a/frontend/src/metabase/redux/metadata.js b/frontend/src/metabase/redux/metadata.js
index 6e530a0ff3c052d8934f6335b37f9c0505564e5a..6530f3d7e43c379d0545461b1e631363fc52d42d 100644
--- a/frontend/src/metabase/redux/metadata.js
+++ b/frontend/src/metabase/redux/metadata.js
@@ -400,7 +400,7 @@ const databases = handleActions({
 }, {});
 
 const databasesList = handleActions({
-    [FETCH_DATABASES]: { next: (state, { payload }) => payload.result }
+    [FETCH_DATABASES]: { next: (state, { payload }) => (payload && payload.result) || state }
 }, []);
 
 const tables = handleActions({