diff --git a/components/eam/src/physics/cam/cam_diagnostics.F90 b/components/eam/src/physics/cam/cam_diagnostics.F90
index 0b4abed44720..c30c40ed1e63 100644
--- a/components/eam/src/physics/cam/cam_diagnostics.F90
+++ b/components/eam/src/physics/cam/cam_diagnostics.F90
@@ -1336,15 +1336,7 @@ subroutine diag_phys_writeout(state, psl)
        ftem(:ncol,1) = ftem(:ncol,1) + ftem(:ncol,k)
     end do
     call outfld ('TMQ     ',ftem, pcols   ,lchnk     )
-!     
-! Mass of saturated q vertically integrated
-!
-    call qsat(state%t(:ncol,:), state%pmid(:ncol,:), tem2(:ncol,:), ftem(:ncol,:))
-    ftem(:ncol,:) = ftem(:ncol,:) * state%pdel(:ncol,:) * rga
-    do k=2,pver
-       ftem(:ncol,1) = ftem(:ncol,1) + ftem(:ncol,k)
-    end do
-    call outfld ('TMQS    ',ftem, pcols   ,lchnk     )
+
 !
 ! Mass of vertically integrated water vapor flux
 !
@@ -1378,6 +1370,14 @@ subroutine diag_phys_writeout(state, psl)
 
     if (moist_physics) then
 
+      ! Mass of saturated q vertically integrated
+       call qsat(state%t(:ncol,:), state%pmid(:ncol,:), tem2(:ncol,:), ftem(:ncol,:))
+       ftem(:ncol,:) = ftem(:ncol,:) * state%pdel(:ncol,:) * rga
+       do k=2,pver
+          ftem(:ncol,1) = ftem(:ncol,1) + ftem(:ncol,k)
+       end do
+       call outfld ('TMQS    ',ftem, pcols   ,lchnk     )
+
        ! Relative humidity
        call qsat(state%t(:ncol,:), state%pmid(:ncol,:), &
             tem2(:ncol,:), ftem(:ncol,:))