diff --git a/photoslibraryapi/src/main/java/com/google/photos/library/v1/PhotosLibraryClient.java b/photoslibraryapi/src/main/java/com/google/photos/library/v1/PhotosLibraryClient.java
index 447bf08..4a761a5 100644
--- a/photoslibraryapi/src/main/java/com/google/photos/library/v1/PhotosLibraryClient.java
+++ b/photoslibraryapi/src/main/java/com/google/photos/library/v1/PhotosLibraryClient.java
@@ -319,4 +319,15 @@ public final ListMediaItemsPagedResponse listMediaItems() {
   public final ListSharedAlbumsPagedResponse listSharedAlbums() {
     return super.listSharedAlbums(false);
   }
+
+  @Override
+  public void close() {
+    super.close();
+    try {
+      uploadStub.close();
+    } catch (Exception e) {
+      // workaround to avoid to modify parent's signature. Should not be needed starting from gax v2
+      throw new RuntimeException(e);
+    }
+  }
 }
diff --git a/photoslibraryapi/src/main/java/com/google/photos/library/v1/internal/InternalPhotosLibraryClient.java b/photoslibraryapi/src/main/java/com/google/photos/library/v1/internal/InternalPhotosLibraryClient.java
index 3ddbae6..79a4156 100644
--- a/photoslibraryapi/src/main/java/com/google/photos/library/v1/internal/InternalPhotosLibraryClient.java
+++ b/photoslibraryapi/src/main/java/com/google/photos/library/v1/internal/InternalPhotosLibraryClient.java
@@ -1884,7 +1884,7 @@ public final UnaryCallable<UpdateMediaItemRequest, MediaItem> updateMediaItemCal
   }
 
   @Override
-  public final void close() {
+  public void close() {
     stub.close();
   }