diff --git a/src/KOKKOS/kokkos.cpp b/src/KOKKOS/kokkos.cpp
index 720dd3b3b2..60a3cfd2d1 100644
--- a/src/KOKKOS/kokkos.cpp
+++ b/src/KOKKOS/kokkos.cpp
@@ -220,7 +220,7 @@ KokkosLMP::KokkosLMP(LAMMPS *lmp, int narg, char **arg) : Pointers(lmp)
 
   int nmpi = 0;
   MPI_Comm_size(world,&nmpi);
-  if (nmpi > 0) {
+  if (nmpi > 1) {
 
 #if defined(MPI_VERSION) && (MPI_VERSION > 2)
     // Check for IBM Spectrum MPI
@@ -397,6 +397,8 @@ void KokkosLMP::accelerator(int narg, char **arg)
     } else error->all(FLERR,"Illegal package kokkos command");
   }
 
+#ifdef KOKKOS_ENABLE_CUDA
+
   // if "cuda/aware off" and "comm device", change to "comm host"
 
   if (!cuda_aware_flag) {
@@ -431,6 +433,8 @@ void KokkosLMP::accelerator(int narg, char **arg)
     }
   }
 
+#endif
+
   // set newton flags
   // set neighbor binsize, same as neigh_modify command