diff --git a/library/src/main/java/com/jensdriller/libs/undobar/UndoBar.java b/library/src/main/java/com/jensdriller/libs/undobar/UndoBar.java
index 5aff274..7e23bf8 100644
--- a/library/src/main/java/com/jensdriller/libs/undobar/UndoBar.java
+++ b/library/src/main/java/com/jensdriller/libs/undobar/UndoBar.java
@@ -67,7 +67,7 @@ public interface Listener {
         /**
          * Will be fired when the undo bar disappears without being actioned.
          */
-        void onHide();
+        void onHide(Parcelable token);
 
         /**
          * Will be fired when the undo button is pressed.
@@ -392,8 +392,10 @@ public void onAnimationEnd() {
      * Hides the undo bar and notifies potential listener.
      */
     protected void onHide() {
+        // hide(true) will set mUndoToken to null, so we grab a reference and pass it to safelyNotifyOnHide()
+        Parcelable token = mUndoToken;
         hide(true);
-        safelyNotifyOnHide();
+        safelyNotifyOnHide(token);
         mUndoListener = null;
     }
 
@@ -402,25 +404,27 @@ protected void onHide() {
      * Hides the undo bar and notifies potential listener.
      */
     protected void onUndo() {
+        // hide(true) will set mUndoToken to null, so we grab a reference and pass it to safelyNotifyOnHide()
+        Parcelable token = mUndoToken;
         hide(true);
-        safelyNotifyOnUndo();
+        safelyNotifyOnUndo(token);
     }
 
     /**
      * Notifies listener if available.
      */
-    protected void safelyNotifyOnHide() {
+    protected void safelyNotifyOnHide(Parcelable token) {
         if (mUndoListener != null) {
-            mUndoListener.onHide();
+            mUndoListener.onHide(token);
         }
     }
 
     /**
      * Notifies listener if available.
      */
-    protected void safelyNotifyOnUndo() {
+    protected void safelyNotifyOnUndo(Parcelable token) {
         if (mUndoListener != null) {
-            mUndoListener.onUndo(mUndoToken);
+            mUndoListener.onUndo(token);
         }
     }