diff --git a/demo/src/main/java/com/bluelinelabs/conductor/demo/controllers/PagerController.java b/demo/src/main/java/com/bluelinelabs/conductor/demo/controllers/PagerController.java
index 2f34de4..c452eed 100644
--- a/demo/src/main/java/com/bluelinelabs/conductor/demo/controllers/PagerController.java
+++ b/demo/src/main/java/com/bluelinelabs/conductor/demo/controllers/PagerController.java
@@ -49,6 +49,12 @@ public class PagerController extends BaseController {
         };
     }
 
+    @NonNull
+    @Override
+    protected View inflateView(@NonNull LayoutInflater inflater, @NonNull ViewGroup container) {
+        return inflater.inflate(R.layout.controller_pager, container, false);
+    }
+
     @Override
     protected void onViewBound(@NonNull View view) {
         super.onViewBound(view);
@@ -58,16 +64,13 @@ public class PagerController extends BaseController {
 
     @Override
     protected void onDestroyView(@NonNull View view) {
-        viewPager.setAdapter(null);
+        if (!getActivity().isChangingConfigurations()) {
+            viewPager.setAdapter(null);
+        }
+        tabLayout.setupWithViewPager(null);
         super.onDestroyView(view);
     }
 
-    @NonNull
-    @Override
-    protected View inflateView(@NonNull LayoutInflater inflater, @NonNull ViewGroup container) {
-        return inflater.inflate(R.layout.controller_pager, container, false);
-    }
-
     @Override
     protected String getTitle() {
         return "ViewPager Demo";