diff --git a/db/db.go b/db/db.go
index 89f8743..f07297c 100644
--- a/db/db.go
+++ b/db/db.go
@@ -21,18 +21,23 @@ func CreateAllTables() error {
 	return CreateSessionsTable()
 }
 
-func GetDbUrl() string {
+func GetDbUrl(noDBName bool) string {
 	host := os.Getenv("PGHOST")
 	port := os.Getenv("PGPORT")
 	user := os.Getenv("PGUSER")
 	pass := os.Getenv("PGPASSWORD")
+	db := os.Getenv("PGDATABASE")
 
-	return fmt.Sprintf("postgres://%s:%s@%s:%s", user, pass, host, port)
+	if noDBName {
+		return fmt.Sprintf("postgres://%s:%s@%s:%s", user, pass, host, port)
+	} else {
+		return fmt.Sprintf("postgres://%s:%s@%s:%s/%s", user, pass, host, port, db)
+	}
 }
 
 func CreateDB() error {
 	conn, err := pgx.Connect(context.Background(),
-		GetDbUrl(),
+		GetDbUrl(true),
 	)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Cannot connect to PostgreSQL: %v\n", err)
diff --git a/main.go b/main.go
index ee0c35d..97f96c2 100644
--- a/main.go
+++ b/main.go
@@ -22,10 +22,7 @@ func main() {
 	check("ensuring muzi DB exists", db.CreateDB())
 
 	var err error
-	db.Pool, err = pgxpool.New(
-		context.Background(),
-		fmt.Sprintf(db.GetDbUrl(), "/muzi"),
-	)
+	db.Pool, err = pgxpool.New(context.Background(), db.GetDbUrl(false))
 	check("connecting to muzi database", err)
 	defer db.Pool.Close()