diff --git a/hover/src/main/java/io/mattcarroll/hover/HoverViewStateCollapsed.java b/hover/src/main/java/io/mattcarroll/hover/HoverViewStateCollapsed.java
index cb2ab16..519f05e 100644
--- a/hover/src/main/java/io/mattcarroll/hover/HoverViewStateCollapsed.java
+++ b/hover/src/main/java/io/mattcarroll/hover/HoverViewStateCollapsed.java
@@ -294,7 +294,9 @@ private void onDocked() {
         mIsCollapsed = true;
         mHoverView.saveVisualState();
         if (didJustCollapse) {
-            mOnStateChanged.run();
+            if (mOnStateChanged != null) {
+                mOnStateChanged.run();
+            }
         }
         mHoverView.notifyOnDocked(this);
     }
diff --git a/hover/src/main/java/io/mattcarroll/hover/HoverViewStatePreviewed.java b/hover/src/main/java/io/mattcarroll/hover/HoverViewStatePreviewed.java
index 3ce8bcd..f777b21 100644
--- a/hover/src/main/java/io/mattcarroll/hover/HoverViewStatePreviewed.java
+++ b/hover/src/main/java/io/mattcarroll/hover/HoverViewStatePreviewed.java
@@ -32,7 +32,7 @@ class HoverViewStatePreviewed extends HoverViewStateCollapsed {
 
     @Override
     public void takeControl(@NonNull HoverView hoverView, final Runnable onStateChanged) {
-        super.takeControl(hoverView, onStateChanged);
+        super.takeControl(hoverView, null);
         Log.d(TAG, "Taking control.");
         mMessageView = mHoverView.mScreen.getTabMessageView(mHoverView.mSelectedSectionId);
         mMessageView.appear(mHoverView.mCollapsedDock, new Runnable() {