diff --git a/flink-connector-bigquery-common/pom.xml b/flink-connector-bigquery-common/pom.xml
index b8579f2c..00638ec0 100644
--- a/flink-connector-bigquery-common/pom.xml
+++ b/flink-connector-bigquery-common/pom.xml
@@ -55,6 +55,13 @@ under the License.
             <artifactId>google-cloud-bigquery</artifactId>
         </dependency>
 
+        <!-- Not directly consumed, kept for shading -->
+        <!-- This will be a different version of guava than the one used by Flink -->
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
         <!-- org.apache.avro - used by SchemaTransform -->
         <dependency>
             <groupId>org.apache.avro</groupId>
diff --git a/pom.xml b/pom.xml
index 9d013090..03487169 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,6 +75,7 @@ under the License.
     <properties>
         <revision>0.4-SNAPSHOT</revision>
         <flink.version>1.17.1</flink.version>
+        <bigquery.guava.version>32.1.3-jre</bigquery.guava.version>
         <google-lib-bom.version>26.33.0</google-lib-bom.version>
 
         <junit5.version>5.9.3</junit5.version>
@@ -175,6 +176,13 @@ under the License.
                 <scope>import</scope>
             </dependency>
 
+            <!-- The guava version used by BigQuery, not Flink -->
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>${bigquery.guava.version}</version>
+            </dependency>
+
             <!-- Utilities -->
             <dependency>
                 <groupId>dev.failsafe</groupId>
@@ -347,32 +355,49 @@ under the License.
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>shade-flink</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <includes>
+                                    <include>com.google.guava:guava:*</include>
+                                </includes>
+                            </artifactSet>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+                <version>1.5.0</version>
+                <configuration>
+                    <updatePomFile>true</updatePomFile>
+                    <flattenMode>resolveCiFriendliesOnly</flattenMode>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>flatten</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>flatten</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>flatten.clean</id>
+                        <phase>clean</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>flatten-maven-plugin</artifactId>
-				<version>1.5.0</version>
-				<configuration>
-					<updatePomFile>true</updatePomFile>
-					<flattenMode>resolveCiFriendliesOnly</flattenMode>
-				</configuration>
-				<executions>
-					<execution>
-						<id>flatten</id>
-						<phase>verify</phase>
-						<goals>
-							<goal>flatten</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>flatten.clean</id>
-						<phase>clean</phase>
-						<goals>
-							<goal>clean</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
             <plugin>
                 <groupId>org.commonjava.maven.plugins</groupId>
                 <artifactId>directory-maven-plugin</artifactId>