diff --git a/CIME/case/case_submit.py b/CIME/case/case_submit.py
index 699770cd6d7..29a0c0d2af0 100644
--- a/CIME/case/case_submit.py
+++ b/CIME/case/case_submit.py
@@ -65,10 +65,10 @@ def _submit(
         # only checks for the first instance in a multidriver case
         if case.get_value("COMP_INTERFACE") == "nuopc":
             rpointer = "rpointer.cpl"
-        elif case.get_value("MULTI_DRIVER"):
-            rpointer = "rpointer.drv_0001"
         else:
             rpointer = "rpointer.drv"
+        if case.get_value("MULTI_DRIVER"):
+            rpointer = rpointer + "_0001"
         expect(
             os.path.exists(os.path.join(rundir, rpointer)),
             "CONTINUE_RUN is true but this case does not appear to have restart files staged in {} {}".format(