According to The Hollywood Reporter, an insider confirmed: "They're keeping them separated as much as possible."
The trouble dates back to the tail end of the movie's 100-day shoot - it's alleged Diesel was frequently late, causing Johnson to eventually snap and vent his rage on social media.
"My female co-stars are always amazing, and I love 'em," he wrote on Facebook.
"My male co-stars however are a different story," adding that "some" are "chicken s**t" and "candy asses."
According to sources, those comments (unsurprisingly) led to a very heated on set exchange between the actors.
While Diesel and Johnson have been able to avoid each so far, it'll be a different story next month when the pair hit the same red carpet for the Fast 8 premiere in New York.