diff --git a/src/addon/ESMX/Driver/ESMX_Driver.F90 b/src/addon/ESMX/Driver/ESMX_Driver.F90
index eac2465c5f..39227b2e53 100644
--- a/src/addon/ESMX/Driver/ESMX_Driver.F90
+++ b/src/addon/ESMX/Driver/ESMX_Driver.F90
@@ -300,8 +300,8 @@ subroutine SetModelServices(driver, rc)
 
       if (inCompDef) then
         ! add child component with SetVM and SetServices in CompDef
-#if defined (__INTEL_LLVM_COMPILER) || (__NVCOMPILER)
-!TODO: remove once IFX, NVHPC, and PGI compilers work correctly w/o work-around
+#if defined (__INTEL_LLVM_COMPILER) || defined (__NVCOMPILER) || defined (NAGFOR)
+!TODO: remove once IFX, NVHPC, and NAG compilers work correctly w/o work-around
         call NUOPC_DriverAddGridCompPtr(driver, trim(compLabel), hconfig=hconfig, &
           compSetServicesRoutine=CompDef(j)%ssPtr, compSetVMRoutine=CompDef(j)%svPtr, &
           info=info, petList=petList, devList=devList, comp=comp, rc=rc)
diff --git a/src/addon/NUOPC/src/NUOPC_Driver.F90 b/src/addon/NUOPC/src/NUOPC_Driver.F90
index 71c7ad129d..887e8083e7 100644
--- a/src/addon/NUOPC/src/NUOPC_Driver.F90
+++ b/src/addon/NUOPC/src/NUOPC_Driver.F90
@@ -116,7 +116,7 @@ module NUOPC_Driver
 
   ! Generic methods
   public NUOPC_DriverAddComp
-#if defined (__INTEL_LLVM_COMPILER) || (__NVCOMPILER)
+#if defined (__INTEL_LLVM_COMPILER) || defined (__NVCOMPILER) || defined (NAGFOR)
   public NUOPC_DriverAddGridCompPtr !TODO: remove once compliers are fixed
 #endif
   public NUOPC_DriverAddRunElement
@@ -4526,7 +4526,7 @@ recursive subroutine FinalizeReset(driver, importState, exportState, clock, rc)
   !-----------------------------------------------------------------------------
   !-----------------------------------------------------------------------------
 
-#if defined (__INTEL_LLVM_COMPILER) || defined (__NVCOMPILER)
+#if defined (__INTEL_LLVM_COMPILER) || defined (__NVCOMPILER) || defined (NAGFOR)
   !-----------------------------------------------------------------------------
 !BOPI
 ! !IROUTINE: NUOPC_DriverAddComp - Add a GridComp child to a Driver using procedure pointers