diff --git a/src/components/selectors/DatabaseSelector.js b/src/components/selectors/DatabaseSelector.js
index 5432bd1..e702a02 100644
--- a/src/components/selectors/DatabaseSelector.js
+++ b/src/components/selectors/DatabaseSelector.js
@@ -39,7 +39,7 @@ class DatabaseSelector extends Component {
 
         //  Look up the current server:
         let selectedServer =  SettingsStore.getServer(currentServer);
-        let serverDatabases = selectedServer.databases || [];
+        let serverDatabases = selectedServer && selectedServer.databases || [];
 
         //  If we have no databases, display a message and give the ability to refresh
         if(serverDatabases.length < 1)