diff --git a/src/input_xml.F90 b/src/input_xml.F90
index 7b63e00cc9..1d3af286ff 100644
--- a/src/input_xml.F90
+++ b/src/input_xml.F90
@@ -735,6 +735,9 @@ contains
        t % n_filter_bins = 0
        t % stride = 0
 
+       ! Set tally type to volume by default
+       t % type = TALLY_VOLUME
+
        ! Copy material id
        t % id = tally_(i) % id
 
@@ -892,7 +895,7 @@ contains
                 t % score_bins(j) % scalar = SCORE_NU_FISSION
              case ('current')
                 t % score_bins(j) % scalar = SCORE_CURRENT
-                t % surface_current = .true.
+                t % type = TALLY_SURFACE_CURRENT
 
                 ! Check to make sure that current is the only desired response
                 ! for this tally
diff --git a/src/tally.F90 b/src/tally.F90
index 84af6df159..79e31fecdb 100644
--- a/src/tally.F90
+++ b/src/tally.F90
@@ -61,7 +61,7 @@ contains
        filter_bins = 1
 
        ! handle surface current tallies separately
-       if (t % surface_current) then
+       if (t % type == TALLY_SURFACE_CURRENT) then
           m => meshes(t % mesh)
 
           t % stride(SURF_FILTER_SURFACE) = filter_bins
@@ -273,7 +273,7 @@ contains
        t => tallies(i)
 
        ! Surface current tallies are treated separately
-       if (t % surface_current) cycle
+       if (t % type == TALLY_SURFACE_CURRENT) cycle
 
        ! =======================================================================
        ! DETERMINE SCORING BIN COMBINATION
@@ -552,7 +552,7 @@ contains
        t => tallies(i)
 
        ! Skip non-surface-current tallies
-       if (.not. t % surface_current) cycle
+       if (t % type /= TALLY_SURFACE_CURRENT) cycle
 
        ! Determine indices for starting and ending location
        m => meshes(t % mesh)
@@ -969,7 +969,7 @@ contains
        call header("TALLY " // trim(to_str(t % id)), unit=UNIT_TALLY, level=3)
 
        ! Handle surface current tallies separately
-       if (t % surface_current) then
+       if (t % type == TALLY_SURFACE_CURRENT) then
           call write_surface_current(t)
           cycle
        end if
diff --git a/src/tally_header.F90 b/src/tally_header.F90
index e9c4c5a85f..6b22914d04 100644
--- a/src/tally_header.F90
+++ b/src/tally_header.F90
@@ -62,7 +62,6 @@ module tally_header
      integer :: type      ! volume, surface current
      integer :: estimator ! collision, track-length
      real(8) :: volume    ! volume of region
-     logical :: surface_current = .false.
 
      ! Tally bin specifications