diff --git a/src/finish.cpp b/src/finish.cpp
index 352c547b10..e9c6d3df81 100644
--- a/src/finish.cpp
+++ b/src/finish.cpp
@@ -537,8 +537,8 @@ void Finish::end(int flag)
            neighbor->old_requests[m]->respaouter ||
            neighbor->old_requests[m]->half_from_full) &&
           neighbor->old_requests[m]->skip == 0) {
-        if (neighbor->lists[m] && neighbor->lists[m]->numneigh) break;
         if (lmp->kokkos && lmp->kokkos->neigh_list_kokkos(m)) break;
+        else break;
       }
     }
 
@@ -576,8 +576,8 @@ void Finish::end(int flag)
     for (m = 0; m < neighbor->old_nrequest; m++) {
       if (neighbor->old_requests[m]->full &&
           neighbor->old_requests[m]->skip == 0) {
-        if (neighbor->lists[m] && neighbor->lists[m]->numneigh) break;
         if (lmp->kokkos && lmp->kokkos->neigh_list_kokkos(m)) break;
+        else break;
       }
     }
 
diff --git a/src/run.cpp b/src/run.cpp
index 4aaedcfd63..2ac9f6cc55 100644
--- a/src/run.cpp
+++ b/src/run.cpp
@@ -16,6 +16,7 @@
 #include "run.h"
 #include "domain.h"
 #include "update.h"
+#include "force.h"
 #include "integrate.h"
 #include "modify.h"
 #include "output.h"
@@ -23,7 +24,6 @@
 #include "input.h"
 #include "timer.h"
 #include "error.h"
-#include "force.h"
 
 using namespace LAMMPS_NS;