diff --git a/api.go b/api.go
index d421cc0..9f9f78a 100644
--- a/api.go
+++ b/api.go
@@ -19,7 +19,6 @@ func API_RunQuery(c *gin.Context) {
 		return
 	}
 
-	history = append(history, query)
 	API_HandleQuery(query, c)
 }
 
@@ -46,7 +45,7 @@ func API_GetTable(c *gin.Context) {
 }
 
 func API_History(c *gin.Context) {
-	c.JSON(200, history)
+	c.JSON(200, dbClient.history)
 }
 
 func API_Info(c *gin.Context) {
diff --git a/client.go b/client.go
index 9dc0e42..47b88dc 100644
--- a/client.go
+++ b/client.go
@@ -15,7 +15,8 @@ const (
 )
 
 type Client struct {
-	db *sqlx.DB
+	db      *sqlx.DB
+	history []string
 }
 
 type Result struct {
@@ -37,6 +38,10 @@ func NewClient() (*Client, error) {
 	return &Client{db: db}, nil
 }
 
+func (client *Client) recordQuery(query string) {
+	client.history = append(client.history, query)
+}
+
 func (client *Client) Tables() ([]string, error) {
 	res, err := client.Query(SQL_TABLES)
 
@@ -56,6 +61,8 @@ func (client *Client) Tables() ([]string, error) {
 func (client *Client) Query(query string) (*Result, error) {
 	rows, err := client.db.Queryx(query)
 
+	client.recordQuery(query)
+
 	if err != nil {
 		return nil, err
 	}
diff --git a/main.go b/main.go
index 104706f..b40cdb2 100644
--- a/main.go
+++ b/main.go
@@ -19,7 +19,6 @@ var options struct {
 }
 
 var dbClient *Client
-var history []string
 
 func getConnectionString() string {
 	if options.Url != "" {