diff --git a/lib/kokkos/core/src/impl/Kokkos_HostThreadTeam.cpp b/lib/kokkos/core/src/impl/Kokkos_HostThreadTeam.cpp
index e356e6187f92a07145e80af60b4b98149a03d892..ba15f870fc30f1b43c26a72f8432819b2b3ca853 100644
--- a/lib/kokkos/core/src/impl/Kokkos_HostThreadTeam.cpp
+++ b/lib/kokkos/core/src/impl/Kokkos_HostThreadTeam.cpp
@@ -287,9 +287,9 @@ int HostThreadTeamData::rendezvous( int64_t * const buffer
       //   ( rank % size_byte ) +
       //   ( ( rank / size_byte ) * size_byte * size_mem_cycle ) +
       //   ( sync_offset * size_byte )
-      const int offset = ( rank & mask_byte )
-                       + ( ( rank & ~mask_byte ) << shift_mem_cycle )
-                       + ( sync_offset << shift_byte );
+      int offset = ( rank & mask_byte )
+                 + ( ( rank & ~mask_byte ) << shift_mem_cycle )
+                 + ( sync_offset << shift_byte );
 
       // Switch designated byte if running on big endian machine
       volatile uint16_t value = 1;
diff --git a/lib/kokkos/core/src/impl/Kokkos_Rendezvous.cpp b/lib/kokkos/core/src/impl/Kokkos_Rendezvous.cpp
index 4f9e2d61c333bc9f83be956ec1b5e3236789b412..013aec03d36c2a9adf5d320ac615fc9f9abfaff7 100644
--- a/lib/kokkos/core/src/impl/Kokkos_Rendezvous.cpp
+++ b/lib/kokkos/core/src/impl/Kokkos_Rendezvous.cpp
@@ -133,9 +133,9 @@ int rendezvous( volatile int64_t * const buffer
       //   ( rank % size_byte ) +
       //   ( ( rank / size_byte ) * size_byte * size_mem_cycle ) +
       //   ( sync_offset * size_byte )
-      const int offset = ( rank & mask_byte )
-                       + ( ( rank & ~mask_byte ) << shift_mem_cycle )
-                       + ( sync_offset << shift_byte );
+      int offset = ( rank & mask_byte )
+                 + ( ( rank & ~mask_byte ) << shift_mem_cycle )
+                 + ( sync_offset << shift_byte );
 
       // Switch designated byte if running on big endian machine
       volatile uint16_t value = 1;