diff --git a/demo/src/main/java/com/venmo/android/pin/pindemo/demo/PinDemoActivity.java b/demo/src/main/java/com/venmo/android/pin/pindemo/demo/PinDemoActivity.java
index 0cf5db2..324e8e9 100644
--- a/demo/src/main/java/com/venmo/android/pin/pindemo/demo/PinDemoActivity.java
+++ b/demo/src/main/java/com/venmo/android/pin/pindemo/demo/PinDemoActivity.java
@@ -3,26 +3,24 @@
 import android.app.Activity;
 import android.app.Fragment;
 import android.os.Bundle;
-import android.os.SystemClock;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.Toast;
 
-import com.venmo.android.pin.AsyncSaver;
-import com.venmo.android.pin.AsyncValidator;
 import com.venmo.android.pin.PinFragment;
-import com.venmo.android.pin.PinFragmentConfiguration;
 import com.venmo.android.pin.util.PinHelper;
 
-import java.io.IOError;
-import java.io.IOException;
-
 public class PinDemoActivity extends Activity implements PinFragment.Listener {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_pin_demo);
+
+        if (savedInstanceState != null) {
+            return;
+        }
+
         Fragment toShow = PinHelper.hasDefaultPinSaved(this) ?
                 PinFragment.newInstanceForVerification() :
                 PinFragment.newInstanceForCreation();