diff --git a/bridgev2/portal.go b/bridgev2/portal.go
index 158cd85b..c4c7592c 100644
--- a/bridgev2/portal.go
+++ b/bridgev2/portal.go
@@ -3442,7 +3442,9 @@ func (portal *Portal) createMatrixRoomInLoop(ctx context.Context, source *UserLo
 			}
 		}
 	}
-	portal.doForwardBackfill(ctx, source, nil, backfillBundle)
+	if portal.Bridge.Config.Backfill.Enabled {
+		portal.doForwardBackfill(ctx, source, nil, backfillBundle)
+	}
 	return nil
 }