diff --git a/package-lock.json b/package-lock.json
index 6f9f51c..5b3be63 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "sqliteviz",
-  "version": "0.22.0",
+  "version": "0.23.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "sqliteviz",
-      "version": "0.22.0",
+      "version": "0.23.0",
       "license": "Apache-2.0",
       "dependencies": {
         "codemirror": "^5.57.0",
diff --git a/src/views/LoadView.vue b/src/views/LoadView.vue
index 872ed0c..9ac408f 100644
--- a/src/views/LoadView.vue
+++ b/src/views/LoadView.vue
@@ -74,6 +74,9 @@ export default {
 
         if (dataFormat === 'sqlite') {
           await this.getSqliteDb(dataUrl)
+        } else {
+          this.dataMsg.message = 'Unknown data format'
+          this.dataMsg.type = 'error'
         }
 
         // Loading indicator is not needed anymore
diff --git a/src/views/Main/Workspace/index.vue b/src/views/Main/Workspace/index.vue
index 5ee54c1..c8e477a 100644
--- a/src/views/Main/Workspace/index.vue
+++ b/src/views/Main/Workspace/index.vue
@@ -36,7 +36,7 @@ export default {
   },
   async beforeCreate () {
     const schema = this.$store.state.db.schema
-    if (!schema || schema.length === 0) {
+    if ((!schema || schema.length === 0) && this.$store.state.tabs.length === 0) {
       const stmt = [
         '/*',
         ' * Your database is empty. In order to start building charts',