diff --git a/utils/syncdata.m b/utils/syncdata.m
index d6a09bfff2d4780091f9cad32ed106ca9374c7a9..05dccc01a29b372bd84d074347b83e1bcd47c716 100644
--- a/utils/syncdata.m
+++ b/utils/syncdata.m
@@ -49,9 +49,11 @@ function [arduSynced, tunnelSynced, arduStartTime, tunnelStartTime] = ...
     time = 0:1 / WT_SAMPLING:size(tunnelData, 1) / WT_SAMPLING;
     dummy = interp1(arduShort(:, 1), arduShort(:, 2:end), time);
     arduShort = [time', dummy];
+    nanIdx = find(isnan(arduShort(:, 2)));
+    arduShort(nanIdx:end, :) = [];     % Remove extrapolated values
 
     % Cut longests dataset
-    maxTime = max(size(arduShort, 1), size(tunnelData, 1));
+    maxTime = min(size(arduShort, 1), size(tunnelData, 1));
     arduShort(maxTime:end, :) = [];
     tunnelData(maxTime:end, :) = [];