diff --git a/src/com/android/calendar/AgendaActivity.java b/src/com/android/calendar/AgendaActivity.java
index 97a6e5a..00a46af 100644
--- a/src/com/android/calendar/AgendaActivity.java
+++ b/src/com/android/calendar/AgendaActivity.java
@@ -27,6 +27,7 @@
 import android.content.SharedPreferences;
 import android.database.ContentObserver;
 import android.database.Cursor;
+import android.database.MatrixCursor;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
@@ -267,6 +268,12 @@
 
         mContentResolver.unregisterContentObserver(mObserver);
         unregisterReceiver(mIntentReceiver);
+
+        // Clear the cursor so it won't crash when switching orientation while scrolling b/2022729
+        String[] columns = new String[1];
+        columns[0] = "_id";
+        AgendaListView current = (AgendaListView) mViewSwitcher.getCurrentView();
+        current.setCursor(new MatrixCursor(columns));
     }
 
     @Override