diff --git a/main.go b/main.go
index f71bf17..1369076 100644
--- a/main.go
+++ b/main.go
@@ -3,6 +3,7 @@ package main
 
 import (
 	"os"
+	fp "path/filepath"
 
 	"github.com/RadhiFadlillah/shiori/cmd"
 	db "github.com/RadhiFadlillah/shiori/database"
@@ -12,7 +13,12 @@ import (
 func main() {
 	databasePath := "shiori.db"
 	if value, found := os.LookupEnv("ENV_SHIORI_DB"); found {
-		databasePath = value + "/" + databasePath
+		// If ENV_SHIORI_DB is directory, append "shiori.db" as filename
+		if f1, err := os.Stat(value); err == nil && f1.IsDir() {
+			value = fp.Join(value, "shiori.db")
+		}
+
+		databasePath = value
 	}
 
 	sqliteDB, err := db.OpenSQLiteDatabase(databasePath)