diff --git a/Rx.NET/Source/src/System.Reactive/Concurrency/ThreadPoolScheduler.Windows.cs b/Rx.NET/Source/src/System.Reactive/Concurrency/ThreadPoolScheduler.Windows.cs
index b673d8b3f3..598d0f0e95 100644
--- a/Rx.NET/Source/src/System.Reactive/Concurrency/ThreadPoolScheduler.Windows.cs
+++ b/Rx.NET/Source/src/System.Reactive/Concurrency/ThreadPoolScheduler.Windows.cs
@@ -73,20 +73,16 @@ public override IDisposable Schedule<TState>(TState state, Func<IScheduler, TSta
             if (action == null)
                 throw new ArgumentNullException(nameof(action));
 
-            var d = new SingleAssignmentDisposable();
+            var userWorkItem = new UserWorkItem<TState>(this, state, action);
+            
+            var res = global::Windows.System.Threading.ThreadPool.RunAsync(
+                iaa => userWorkItem.Run(),
+                Priority,
+                Options);
 
-            var res = global::Windows.System.Threading.ThreadPool.RunAsync(iaa =>
-            {
-                if (!d.IsDisposed)
-                {
-                    d.Disposable = action(this, state);
-                }
-            }, Priority, Options);
-
-            return new CompositeDisposable(
-                d,
-                Disposable.Create(res.Cancel)
-            );
+            userWorkItem.CancelQueueDisposable = Disposable.Create(res.Cancel);
+
+            return userWorkItem;
         }
 
         /// <summary>
@@ -115,23 +111,15 @@ public override IDisposable Schedule<TState>(TState state, TimeSpan dueTime, Fun
 
         private IDisposable ScheduleSlow<TState>(TState state, TimeSpan dueTime, Func<IScheduler, TState, IDisposable> action)
         {
-            var d = new SingleAssignmentDisposable();
+            var userWorkItem = new UserWorkItem<TState>(this, state, action);
 
             var res = global::Windows.System.Threading.ThreadPoolTimer.CreateTimer(
-                tpt =>
-                {
-                    if (!d.IsDisposed)
-                    {
-                        d.Disposable = action(this, state);
-                    }
-                },
-                dueTime
-            );
-
-            return new CompositeDisposable(
-                d,
-                Disposable.Create(res.Cancel)
-            );
+                tpt => userWorkItem.Run(),
+                dueTime);
+
+            userWorkItem.CancelQueueDisposable = Disposable.Create(res.Cancel);
+
+            return userWorkItem;
         }
 
         /// <summary>