diff --git a/Source/Libraries/GSF.Core/IO/FileProcessor.cs b/Source/Libraries/GSF.Core/IO/FileProcessor.cs
index 1594627070..db951d695f 100755
--- a/Source/Libraries/GSF.Core/IO/FileProcessor.cs
+++ b/Source/Libraries/GSF.Core/IO/FileProcessor.cs
@@ -260,7 +260,8 @@ private async Task<object> StartEnumerationAsync()
                 if (m_disposed)
                     return null;
 
-                CancellationToken cancellationToken = Interlocked.CompareExchange(ref m_cancellationToken, new CancellationToken(), null);
+                CancellationToken newToken = new CancellationToken();
+                CancellationToken cancellationToken = Interlocked.CompareExchange(ref m_cancellationToken, newToken, null) ?? newToken;
 
                 if (cancellationToken.IsCancelled)
                     return null;