diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQuery.java b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQuery.java
index 47a30cfd32aa..d476db75c3dd 100644
--- a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQuery.java
+++ b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQuery.java
@@ -18,6 +18,7 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 
+import com.google.cloud.BaseWriteChannel;
 import com.google.cloud.FieldSelector;
 import com.google.cloud.FieldSelector.Helper;
 import com.google.cloud.Page;
@@ -1027,5 +1028,6 @@ Page<List<FieldValue>> listTableData(String datasetId, String tableId,
    *
    * @throws BigQueryException upon failure
    */
-  TableDataWriteChannel writer(WriteChannelConfiguration writeChannelConfiguration);
+  BaseWriteChannel<BigQueryOptions, WriteChannelConfiguration> writer(
+      WriteChannelConfiguration writeChannelConfiguration);
 }
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java
index 238db6c79fb2..5ed8e39b4dd9 100644
--- a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java
+++ b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java
@@ -24,6 +24,7 @@
 import com.google.api.services.bigquery.model.TableDataInsertAllRequest.Rows;
 import com.google.api.services.bigquery.model.TableRow;
 import com.google.cloud.BaseService;
+import com.google.cloud.BaseWriteChannel;
 import com.google.cloud.Page;
 import com.google.cloud.PageImpl;
 import com.google.cloud.PageImpl.NextPageFetcher;
@@ -670,7 +671,8 @@ private static QueryResult.Builder transformQueryResults(JobId jobId, List<Table
   }
 
   @Override
-  public TableDataWriteChannel writer(WriteChannelConfiguration writeChannelConfiguration) {
+  public BaseWriteChannel<BigQueryOptions, WriteChannelConfiguration> writer(
+      WriteChannelConfiguration writeChannelConfiguration) {
     return new TableDataWriteChannel(getOptions(),
         writeChannelConfiguration.setProjectId(getOptions().getProjectId()));
   }