diff --git a/store/cockroach/cockroach.go b/store/cockroach/cockroach.go
index 5e31cc7d..c7801e8c 100644
--- a/store/cockroach/cockroach.go
+++ b/store/cockroach/cockroach.go
@@ -98,20 +98,15 @@ func (s *sqlStore) initDB(database, table string) error {
 		return err
 	}
 
-	_, err = s.db.Exec(fmt.Sprintf("SET DATABASE = %s;", database))
-	if err != nil {
-		return errors.Wrap(err, "Couldn't set database")
-	}
-
 	// Create a table for the namespace's prefix
-	_, err = s.db.Exec(fmt.Sprintf(`CREATE TABLE IF NOT EXISTS %s
+	_, err = s.db.Exec(fmt.Sprintf(`CREATE TABLE IF NOT EXISTS %s.%s
 	(
 		key text NOT NULL,
 		value bytea,
 		metadata JSONB,
 		expiry timestamp with time zone,
 		CONSTRAINT %s_pkey PRIMARY KEY (key)
-	);`, table, table))
+	);`, database, table, table))
 	if err != nil {
 		return errors.Wrap(err, "Couldn't create table")
 	}