diff --git a/packages/api/src/controllers/config.js b/packages/api/src/controllers/config.js
index d3d777576..1c476183f 100644
--- a/packages/api/src/controllers/config.js
+++ b/packages/api/src/controllers/config.js
@@ -298,8 +298,12 @@ module.exports = {
 
   changelog_meta: true,
   async changelog() {
-    const resp = await axios.default.get('https://raw.githubusercontent.com/dbgate/dbgate/master/CHANGELOG.md');
-    return resp.data;
+    try {
+      const resp = await axios.default.get('https://raw.githubusercontent.com/dbgate/dbgate/master/CHANGELOG.md');
+      return resp.data;
+    } catch (err) {
+      return ''
+    }
   },
 
   checkLicense_meta: true,
diff --git a/packages/web/src/tabs/ChangelogTab.svelte b/packages/web/src/tabs/ChangelogTab.svelte
index fc9e75d93..dc5f2531a 100644
--- a/packages/web/src/tabs/ChangelogTab.svelte
+++ b/packages/web/src/tabs/ChangelogTab.svelte
@@ -7,9 +7,10 @@
   import LoadingInfo from '../elements/LoadingInfo.svelte';
   import Markdown from '../elements/Markdown.svelte';
   import { apiCall } from '../utility/api';
+  import _ from 'lodash';
 
   let isLoading = false;
-  let text = null;
+  let text = '';
 
   const handleLoad = async () => {
     isLoading = true;
@@ -27,7 +28,7 @@
   <LoadingInfo message="Loading changelog" />
 {:else}
   <div>
-    <Markdown source={text || ''} />
+    <Markdown source={_.isString(text) ? text: ''} />
   </div>
 {/if}