diff --git a/batched/dense/impl/KokkosBatched_Gemv_Team_Impl.hpp b/batched/dense/impl/KokkosBatched_Gemv_Team_Impl.hpp
index 8d932be036..77ad52bdc7 100644
--- a/batched/dense/impl/KokkosBatched_Gemv_Team_Impl.hpp
+++ b/batched/dense/impl/KokkosBatched_Gemv_Team_Impl.hpp
@@ -50,7 +50,7 @@ struct TeamGemv<MemberType, Trans::NoTranspose, Algo::Gemv::Unblocked> {
         "Batched TeamGemv requires rank-3 A matrix (use "
         "KokkosBlas::TeamGemv for regular rank-2 matrix)";
     if constexpr (Kokkos::is_dyn_rank_view<AViewType>::value)
-      assertm(A.rank_dynamic() == 3, assert_msg) else static_assert(
+      assert(A.rank_dynamic() == 3 && assert_msg) else static_assert(
           AViewType::rank == 3, assert_msg);
 
     if (A.extent(0) == 1) {
@@ -87,7 +87,7 @@ struct TeamGemv<MemberType, Trans::NoTranspose, Algo::Gemv::Blocked> {
         "Batched TeamGemv requires rank-3 A matrix (use "
         "KokkosBlas::TeamGemv for regular rank-2 matrix)";
     if constexpr (Kokkos::is_dyn_rank_view<AViewType>::value)
-      assertm(A.rank_dynamic() == 3, assert_msg) else static_assert(
+      assert(A.rank_dynamic() == 3 && assert_msg) else static_assert(
           AViewType::rank == 3, assert_msg);
     Kokkos::abort(
         "KokkosBlas::TeamGemv<Algo::Gemv::Blocked> for rank-3 matrix is NOT "
@@ -110,7 +110,7 @@ struct TeamGemv<MemberType, Trans::Transpose, Algo::Gemv::Unblocked> {
         "Batched TeamGemv requires rank-3 A matrix (use "
         "KokkosBlas::TeamGemv for regular rank-2 matrix)";
     if constexpr (Kokkos::is_dyn_rank_view<AViewType>::value)
-      assertm(A.rank_dynamic() == 3, assert_msg) else static_assert(
+      assert(A.rank_dynamic() == 3 && assert_msg) else static_assert(
           AViewType::rank == 3, assert_msg);
     if (A.extent(0) == 1) {
       KokkosBlas::
@@ -143,7 +143,7 @@ struct TeamGemv<MemberType, Trans::Transpose, Algo::Gemv::Blocked> {
         "Batched TeamGemv requires rank-3 A matrix (use "
         "KokkosBlas::TeamGemv for regular rank-2 matrix)";
     if constexpr (Kokkos::is_dyn_rank_view<AViewType>::value)
-      assertm(A.rank_dynamic() == 3, assert_msg) else static_assert(
+      assert(A.rank_dynamic() == 3 && assert_msg) else static_assert(
           AViewType::rank == 3, assert_msg);
     Kokkos::abort(
         "KokkosBlas::TeamGemv<Algo::Gemv::Blocked> for rank-3 matrix is NOT "