diff --git a/spec/operators/throttleTime-spec.ts b/spec/operators/throttleTime-spec.ts
index 4e65054ae8..8874fc28a0 100644
--- a/spec/operators/throttleTime-spec.ts
+++ b/spec/operators/throttleTime-spec.ts
@@ -141,16 +141,44 @@ describe('throttleTime operator', () => {
   });
 
   describe('throttleTime(fn, { leading: true, trailing: true })', () => {
-    asDiagram('throttleTime(fn, { leading: true, trailing: true })')('should immediately emit the first and last values in each time window', () =>  {
-      const e1 =   hot('-a-xy-----b--x--cxxx--|');
-      const e1subs =   '^                     !';
-      const t =  time( '----|                  ');
-      const expected = '-a---y----b---x-c---x-|';
+    asDiagram('throttleTime(fn, { leading: true, trailing: true })')('should immediately emit the first and last values in each time window', () => {
+      const e1 =   hot('a123b12-c-23d-2-ef---|');
+      const t =   time('----|                 ');
+      const expected = 'a---b---c---d---e---f|';
+
+      const result = e1.pipe(throttleTime(t, rxTestScheduler, { leading: true, trailing: true }));
+
+      expectObservable(result).toBe(expected);
+    });
+
+    it('should immediately emit the first value in each time window', () =>  {
+      const e1 =   hot('-a---x------b|');
+      const t =   time('----|         ');
+      const expected = '-a---x------b|';
+
+      const result = e1.pipe(throttleTime(t, rxTestScheduler, { leading: true, trailing: true }));
+
+      expectObservable(result).toBe(expected);
+    });
+
+    it('should emit the last throttled value when complete', () => {
+      const e1 =   hot('-x--|');
+      const t =   time('----|');
+      const expected = '----(x|)';
+
+      const result = e1.pipe(throttleTime(t, rxTestScheduler, { leading: false, trailing: true }));
+
+      expectObservable(result).toBe(expected);
+    });
+
+    it('should emit both simple leading and trailing', () => {
+      const e1 =   hot('-a-b------------------|');
+      const t =   time('----|                  ');
+      const expected = '-a---b----------------|';
 
       const result = e1.pipe(throttleTime(t, rxTestScheduler, { leading: true, trailing: true }));
 
       expectObservable(result).toBe(expected);
-      expectSubscriptions(e1.subscriptions).toBe(e1subs);
     });
 
     it('should emit the value if only a single one is given', () => {
diff --git a/src/internal/operators/throttleTime.ts b/src/internal/operators/throttleTime.ts
index baed7785c2..c00ce1f91d 100644
--- a/src/internal/operators/throttleTime.ts
+++ b/src/internal/operators/throttleTime.ts
@@ -130,7 +130,7 @@ class ThrottleTimeSubscriber<T> extends Subscriber<T> {
         this._hasTrailingValue = true;
       }
     } else {
-      this.add(this.throttled = this.scheduler.schedule<DispatchArg<T>>(dispatchNext, this.duration, { subscriber: this }));
+      this.throttle();
       if (this.leading) {
         this.destination.next(value);
       } else if (this.trailing) {
@@ -151,17 +151,27 @@ class ThrottleTimeSubscriber<T> extends Subscriber<T> {
 
   clearThrottle() {
     const throttled = this.throttled;
+
     if (throttled) {
+      throttled.unsubscribe();
+      this.remove(throttled);
+      this.throttled = null;
+
       if (this.trailing && this._hasTrailingValue) {
+        if (this.leading && this.trailing) {
+          this.throttle();
+        }
+
         this.destination.next(this._trailingValue);
         this._trailingValue = null;
         this._hasTrailingValue = false;
       }
-      throttled.unsubscribe();
-      this.remove(throttled);
-      this.throttled = null;
     }
   }
+
+  throttle() {
+    this.add(this.throttled = this.scheduler.schedule<DispatchArg<T>>(dispatchNext, this.duration, { subscriber: this }));
+  }
 }
 
 interface DispatchArg<T> {