diff --git a/matlab/TCV/gdat_tcv.m b/matlab/TCV/gdat_tcv.m
index e770af0e042bddd6111192e0e150d9ac892fa767..e693171474d6732b76b5e2c28ba5757ff8b2f90f 100644
--- a/matlab/TCV/gdat_tcv.m
+++ b/matlab/TCV/gdat_tcv.m
@@ -1374,8 +1374,8 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
              end
              params_eff.data_request = sprintf('\\atlas::top.system.gas.valve_0%.2d:flow',i);
              gasrequest = gdat_tcv(gdat_data.shot,params_eff); gasrequest.units = 'V';
-             gdat_data_data{i} = gasrequest.data;
-             if ~isempty(gasrequest.t)
+             gdat_data_data{i} = gasrequest;
+             if ~isempty(gasrequest.t) && isempty(gdat_data.t) % copy 1st non-empty
                gdat_data.units = gasrequest.units;
                gdat_data.t = gasrequest.t;
                gdat_data.data_fullpath = gasrequest.data_fullpath;