diff --git a/include/cuco/detail/pair.cuh b/include/cuco/detail/pair.cuh
index da50f7258..8e7bdc594 100644
--- a/include/cuco/detail/pair.cuh
+++ b/include/cuco/detail/pair.cuh
@@ -75,8 +75,8 @@ struct is_thrust_pair_like_impl<T,
 
 template <typename T>
 struct is_thrust_pair_like
-  : is_thrust_pair_like_impl<
-      std::remove_reference_t<decltype(thrust::raw_reference_cast(std::declval<T>()))>> {
+  : is_thrust_pair_like_impl<std::remove_const_t< // remove_const to WAR Thrust bug https://github.com/NVIDIA/thrust/issues/1456
+      std::remove_reference_t<decltype(thrust::raw_reference_cast(std::declval<T>()))>>> {
 };
 
 }  // namespace detail
@@ -131,8 +131,10 @@ using pair_type = cuco::pair<K, V>;
  * @return pair_type with first element `f` and second element `s`.
  */
 template <typename F, typename S>
-__host__ __device__ pair_type<F, S> make_pair(F&& f, S&& s) noexcept
+__host__ __device__ auto make_pair(F&& f, S&& s) noexcept
 {
-  return pair_type<F, S>{std::forward<F>(f), std::forward<S>(s)};
+  using decayed_F = std::decay_t<F>;
+  using decayed_S = std::decay_t<S>;
+  return pair_type<decayed_F, decayed_S>{std::forward<decayed_F>(f), std::forward<decayed_S>(s)};
 }
 }  // namespace cuco
\ No newline at end of file