diff --git a/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java
index 09a16fa629ef..4402f732eb72 100644
--- a/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java
+++ b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java
@@ -655,9 +655,9 @@ private static Tuple<? extends Page<FieldValueList>, Long> listTableData(
     try {
       final TableId completeTableId =
           tableId.setProjectId(
-              Strings.isNullOrEmpty(serviceOptions.getProjectId())
-                  ? tableId.getProject()
-                  : serviceOptions.getProjectId());
+              Strings.isNullOrEmpty(tableId.getProject())
+                  ? serviceOptions.getProjectId()
+                  : tableId.getProject());
       TableDataList result =
           runWithRetries(
               new Callable<TableDataList>() {
diff --git a/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryImplTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryImplTest.java
index 8d589bcb59ab..d300661eeb3b 100644
--- a/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryImplTest.java
+++ b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryImplTest.java
@@ -1246,8 +1246,7 @@ public void testListTableDataFromTableIdWithProject() {
     EasyMock.expect(bigqueryRpcMock.listTableData(OTHER_PROJECT, DATASET, TABLE, EMPTY_RPC_OPTIONS))
         .andReturn(TABLE_DATA_PB);
     EasyMock.replay(bigqueryRpcMock);
-    BigQueryOptions bigQueryOptions =
-        createBigQueryOptionsForProject(OTHER_PROJECT, rpcFactoryMock);
+    BigQueryOptions bigQueryOptions = createBigQueryOptionsForProject(PROJECT, rpcFactoryMock);
     bigquery = bigQueryOptions.getService();
     Page<FieldValueList> page = bigquery.listTableData(tableId);
     assertEquals(CURSOR, page.getNextPageToken());