diff --git a/core/services/pg/q.go b/core/services/pg/q.go
index ba2627fa745..49a18817de9 100644
--- a/core/services/pg/q.go
+++ b/core/services/pg/q.go
@@ -296,14 +296,25 @@ func sprintQ(query string, args []interface{}) string {
 		case common.Hash:
 			pairs = append(pairs, fmt.Sprintf("$%d", i+1), fmt.Sprintf("'\\x%x'", v.Bytes()))
 		case pq.ByteaArray:
+			pairs = append(pairs, fmt.Sprintf("$%d", i+1))
+			if v == nil {
+				pairs = append(pairs, "NULL")
+				continue
+			}
+			if len(v) == 0 {
+				pairs = append(pairs, "ARRAY[]")
+				continue
+			}
 			var s strings.Builder
-			fmt.Fprintf(&s, "('\\x%x'", v[0])
+			fmt.Fprintf(&s, "ARRAY['\\x%x'", v[0])
 			for j := 1; j < len(v); j++ {
 				fmt.Fprintf(&s, ",'\\x%x'", v[j])
 			}
-			pairs = append(pairs, fmt.Sprintf("$%d", i+1), fmt.Sprintf("%s)", s.String()))
+			pairs = append(pairs, fmt.Sprintf("%s]", s.String()))
+		case string:
+			pairs = append(pairs, fmt.Sprintf("$%d", i+1), fmt.Sprintf("'%s'", v))
 		default:
-			pairs = append(pairs, fmt.Sprintf("$%d", i+1), fmt.Sprintf("%v", arg))
+			pairs = append(pairs, fmt.Sprintf("$%d", i+1), fmt.Sprintf("%v", v))
 		}
 	}
 	replacer := strings.NewReplacer(pairs...)
diff --git a/core/services/pg/q_test.go b/core/services/pg/q_test.go
index 7692fb792bd..6e59e499887 100644
--- a/core/services/pg/q_test.go
+++ b/core/services/pg/q_test.go
@@ -21,27 +21,27 @@ func Test_sprintQ(t *testing.T) {
 		{"one",
 			"SELECT $1 FROM table;",
 			[]interface{}{"foo"},
-			"SELECT foo FROM table;"},
+			"SELECT 'foo' FROM table;"},
 		{"two",
 			"SELECT $1 FROM table WHERE bar = $2;",
 			[]interface{}{"foo", 1},
-			"SELECT foo FROM table WHERE bar = 1;"},
+			"SELECT 'foo' FROM table WHERE bar = 1;"},
 		{"limit",
 			"SELECT $1 FROM table LIMIT $2;",
 			[]interface{}{"foo", Limit(10)},
-			"SELECT foo FROM table LIMIT 10;"},
+			"SELECT 'foo' FROM table LIMIT 10;"},
 		{"limit-all",
 			"SELECT $1 FROM table LIMIT $2;",
 			[]interface{}{"foo", Limit(-1)},
-			"SELECT foo FROM table LIMIT NULL;"},
+			"SELECT 'foo' FROM table LIMIT NULL;"},
 		{"bytea",
 			"SELECT $1 FROM table WHERE b = $2;",
 			[]interface{}{"foo", []byte{0x0a}},
-			"SELECT foo FROM table WHERE b = '\\x0a';"},
+			"SELECT 'foo' FROM table WHERE b = '\\x0a';"},
 		{"bytea[]",
 			"SELECT $1 FROM table WHERE b = $2;",
 			[]interface{}{"foo", pq.ByteaArray([][]byte{{0xa}, {0xb}})},
-			"SELECT foo FROM table WHERE b = ('\\x0a','\\x0b');"},
+			"SELECT 'foo' FROM table WHERE b = ARRAY['\\x0a','\\x0b'];"},
 	} {
 		t.Run(tt.name, func(t *testing.T) {
 			got := sprintQ(tt.query, tt.args)