diff --git a/src/initialize.F90 b/src/initialize.F90
index ff3a2090f0..869c63ac06 100644
--- a/src/initialize.F90
+++ b/src/initialize.F90
@@ -540,6 +540,9 @@ contains
 
         case (FILTER_SURFACE)
 
+          ! Check if this is a surface filter only for surface currents
+          if (any(t % score_bins == SCORE_CURRENT)) cycle FILTER_LOOP
+
           do k = 1, t % filters(j) % n_bins
             id = t % filters(j) % int_bins(k)
             if (surface_dict % has_key(id)) then