diff --git a/data/bookmark.toml b/data/bookmark.toml
index 05320ff..55a1c7f 100644
--- a/data/bookmark.toml
+++ b/data/bookmark.toml
@@ -1,5 +1,5 @@
 host = "localhost"
-port = "5432"
+port = 5432
 user = "postgres"
 database = "mydatabase"
 ssl = "disable"
diff --git a/data/invalid_port.toml b/data/invalid_port.toml
deleted file mode 100644
index 55a1c7f..0000000
--- a/data/invalid_port.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-host = "localhost"
-port = 5432
-user = "postgres"
-database = "mydatabase"
-ssl = "disable"
diff --git a/pkg/bookmarks/bookmarks.go b/pkg/bookmarks/bookmarks.go
index 2831a0a..33b05c0 100644
--- a/pkg/bookmarks/bookmarks.go
+++ b/pkg/bookmarks/bookmarks.go
@@ -15,7 +15,7 @@ import (
 type Bookmark struct {
 	Url      string         `json:"url"`      // Postgres connection URL
 	Host     string         `json:"host"`     // Server hostname
-	Port     string         `json:"port"`     // Server port
+	Port     int            `json:"port"`     // Server port
 	User     string         `json:"user"`     // Database user
 	Password string         `json:"password"` // User password
 	Database string         `json:"database"` // Database name
diff --git a/pkg/bookmarks/bookmarks_test.go b/pkg/bookmarks/bookmarks_test.go
index 7553bdb..ed6185f 100644
--- a/pkg/bookmarks/bookmarks_test.go
+++ b/pkg/bookmarks/bookmarks_test.go
@@ -14,10 +14,6 @@ func Test_Invalid_Bookmark_Files(t *testing.T) {
 	_, err = readServerConfig("../../data/invalid.toml")
 	assert.Error(t, err)
 	assert.Equal(t, "Near line 1, key 'invalid encoding': Near line 2: Expected key separator '=', but got '\\n' instead.", err.Error())
-
-	_, err = readServerConfig("../../data/invalid_port.toml")
-	assert.Error(t, err)
-	assert.Equal(t, "Type mismatch for 'bookmarks.Bookmark.Port': Expected string but found 'int64'.", err.Error())
 }
 
 func Test_Bookmark(t *testing.T) {
@@ -25,7 +21,7 @@ func Test_Bookmark(t *testing.T) {
 
 	assert.Equal(t, nil, err)
 	assert.Equal(t, "localhost", bookmark.Host)
-	assert.Equal(t, "5432", bookmark.Port)
+	assert.Equal(t, 5432, bookmark.Port)
 	assert.Equal(t, "postgres", bookmark.User)
 	assert.Equal(t, "mydatabase", bookmark.Database)
 	assert.Equal(t, "disable", bookmark.Ssl)
@@ -39,7 +35,7 @@ func Test_Bookmark_URL(t *testing.T) {
 	assert.Equal(t, nil, err)
 	assert.Equal(t, "postgres://username:password@host:port/database?sslmode=disable", bookmark.Url)
 	assert.Equal(t, "", bookmark.Host)
-	assert.Equal(t, "", bookmark.Port)
+	assert.Equal(t, 0, bookmark.Port)
 	assert.Equal(t, "", bookmark.User)
 	assert.Equal(t, "", bookmark.Database)
 	assert.Equal(t, "", bookmark.Ssl)
@@ -75,7 +71,7 @@ func Test_GetBookmark(t *testing.T) {
 	expBookmark := Bookmark{
 
 		Host:     "localhost",
-		Port:     "5432",
+		Port:     5432,
 		User:     "postgres",
 		Password: "",
 		Database: "mydatabase",