diff --git a/src/caffeine/teams_s.f90 b/src/caffeine/teams_s.f90
index 553023b5a..b3f393fb6 100644
--- a/src/caffeine/teams_s.f90
+++ b/src/caffeine/teams_s.f90
@@ -7,9 +7,9 @@
 contains
 
   module procedure prif_change_team
+    team%info%heap_start = current_team%info%child_heap_info%offset + current_team%info%heap_start
+    team%info%heap_size = current_team%info%child_heap_info%size
     if (caf_this_image(team%info%gex_team) == 1) then ! need to setup the heap for the team
-      team%info%heap_start = current_team%info%child_heap_info%offset + current_team%info%heap_start
-      team%info%heap_size = current_team%info%child_heap_info%size
       call caf_establish_mspace( &
           team%info%heap_mspace, &
           as_c_ptr(team%info%heap_start), &