diff --git a/demo/src/com/google/maps/android/utils/demo/BaseDemoActivity.java b/demo/src/com/google/maps/android/utils/demo/BaseDemoActivity.java
index 69421ace0..45a8bea9c 100644
--- a/demo/src/com/google/maps/android/utils/demo/BaseDemoActivity.java
+++ b/demo/src/com/google/maps/android/utils/demo/BaseDemoActivity.java
@@ -23,9 +23,6 @@ public void onCreate(Bundle savedInstanceState) {
     protected void onResume() {
         super.onResume();
         setUpMapIfNeeded();
-        if (getMap() != null) {
-          startDemo();
-        }
     }
 
     private void setUpMapIfNeeded() {
@@ -33,6 +30,9 @@ private void setUpMapIfNeeded() {
             return;
         }
         mMap = ((SupportMapFragment) getSupportFragmentManager().findFragmentById(R.id.map)).getMap();
+        if (mMap != null) {
+            startDemo();
+        }
     }
 
     /**