diff --git a/Source/VideoBlockViewController.swift b/Source/VideoBlockViewController.swift
index d70a4fa78..f27b19e04 100644
--- a/Source/VideoBlockViewController.swift
+++ b/Source/VideoBlockViewController.swift
@@ -176,6 +176,8 @@ class VideoBlockViewController : OfflineSupportViewController, CourseBlockViewCo
         if !chromeCastManager.viewExpanded {
             resetChromeCast()
         }
+        videoTranscriptView?.invalidateTimer()
+        videoTranscriptView = nil
     }
     
     override func viewDidAppear(_ animated : Bool) {
diff --git a/Source/VideoTranscript.swift b/Source/VideoTranscript.swift
index 4c7f6ecb9..432b975c8 100644
--- a/Source/VideoTranscript.swift
+++ b/Source/VideoTranscript.swift
@@ -41,8 +41,6 @@ class VideoTranscript: NSObject, UITableViewDelegate, UITableViewDataSource, Scr
         self.environment = environment
         super.init()
         setupTable(tableView: transcriptTableView)
-        transcriptTableView.dataSource = self
-        transcriptTableView.delegate = self
     }
     
     private func setupTable(tableView: UITableView) {
@@ -52,6 +50,8 @@ class VideoTranscript: NSObject, UITableViewDelegate, UITableViewDataSource, Scr
         tableView.rowHeight = UITableView.automaticDimension
         tableView.estimatedRowHeight = 44
         tableView.isHidden = true
+        tableView.dataSource = self
+        tableView.delegate = self
     }
     
     //MARK: - UITableview methods
@@ -116,4 +116,8 @@ class VideoTranscript: NSObject, UITableViewDelegate, UITableViewDataSource, Scr
     @objc func invalidateDragging(){
         isTableDragged = false
     }
+    
+    func invalidateTimer() {
+        draggingTimer.invalidate()
+    }
 }