diff --git a/infinitepush/__init__.py b/infinitepush/__init__.py
--- a/infinitepush/__init__.py
+++ b/infinitepush/__init__.py
@@ -953,6 +953,13 @@
 
     handleallparts = repo.ui.configbool('infinitepush', 'storeallparts')
 
+    partforwardingwhitelist = []
+    try:
+        treemfmod = extensions.find('treemanifest')
+        partforwardingwhitelist.append(treemfmod.TREEGROUP_PARTTYPE2)
+    except KeyError:
+        pass
+
     bundler = bundle2.bundle20(repo.ui)
     cgparams = None
     with bundle2.partiterator(repo, op, unbundler) as parts:
@@ -977,7 +984,7 @@
                 if not handleallparts:
                     op.records.add(scratchbranchparttype + '_skippushkey', True)
             else:
-                if handleallparts:
+                if handleallparts or part.type in partforwardingwhitelist:
                     # Ideally we would not process any parts, and instead just
                     # forward them to the bundle for storage, but since this
                     # differs from previous behavior, we need to put it behind a