diff --git a/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt b/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt
index 99dc6d37..321c458b 100644
--- a/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt
+++ b/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt
@@ -60,7 +60,7 @@ class PokerAnalyticsApplication : Application() {
 
 		if (BuildConfig.DEBUG) {
 			Timber.d("UserPreferences.defaultCurrency: ${UserDefaults.currency.symbol}")
-			this.createFakeSessions()
+//			this.createFakeSessions()
 		}
 
 		Patcher.patchAll(this.applicationContext)
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/adapter/FeedSessionRowRepresentableAdapter.kt b/app/src/main/java/net/pokeranalytics/android/ui/adapter/FeedSessionRowRepresentableAdapter.kt
index 1838ec85..acb13ad3 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/adapter/FeedSessionRowRepresentableAdapter.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/adapter/FeedSessionRowRepresentableAdapter.kt
@@ -61,11 +61,11 @@ class FeedSessionRowRepresentableAdapter(
 
 		// listeners
 		this.startedSessions.addChangeListener { _, _ ->
-			Timber.d("---> started session change")
+//			Timber.d("---> started session change")
 			refreshData()
 		}
 		this.pendingSessions.addChangeListener { _, _ ->
-			Timber.d("---> pending session change")
+//			Timber.d("---> pending session change")
 			refreshData()
 		}
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FeedFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/FeedFragment.kt
index 3e009bc3..8634aca6 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FeedFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/FeedFragment.kt
@@ -56,6 +56,8 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate {
 
 	}
 
+	private var currentTab = Tab.SESSIONS
+
 	private lateinit var feedSessionAdapter: FeedSessionRowRepresentableAdapter
 	private lateinit var feedTransactionAdapter: FeedTransactionRowRepresentableAdapter
 
@@ -207,13 +209,12 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate {
 				when (tab.position) {
 					Tab.SESSIONS.ordinal -> {
 						currentFilterable = FilterableType.SESSION
-						menuRecyclerView.adapter = feedSessionAdapter
 					}
 					Tab.TRANSACTIONS.ordinal -> {
 						currentFilterable = FilterableType.TRANSACTION
-						menuRecyclerView.adapter = feedTransactionAdapter
 					}
 				}
+				tabChanged(tab.position)
 			}
 
 			override fun onTabUnselected(tab: TabLayout.Tab) {
@@ -351,11 +352,9 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate {
 		filter?.let {
 			when (it.filterableType) {
 				FilterableType.SESSION -> {
-					menuRecyclerView.adapter = feedSessionAdapter
 					this.selectTab(Tab.SESSIONS)
 				}
 				FilterableType.TRANSACTION -> {
-					menuRecyclerView.adapter = feedTransactionAdapter
 					this.selectTab(Tab.TRANSACTIONS)
 				}
 				else -> {
@@ -366,24 +365,33 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate {
 
 		if (!adapterHasBeenSet) {
 			adapterHasBeenSet = true
-			menuRecyclerView.adapter = feedSessionAdapter
+			this.setAdapter()
 		}
 	}
 
 	override fun removeFilter() {
 		super.removeFilter()
-
 		this.loadSessions()
 		this.loadTransactions()
-		if (currentFilterable == FilterableType.SESSION) {
-			menuRecyclerView.adapter = feedSessionAdapter
-		} else {
-			menuRecyclerView.adapter = feedTransactionAdapter
-		}
+		this.setAdapter()
 	}
 
 	private fun selectTab(tab: Tab) {
+		this.currentTab = tab
 		this.tabs.getTabAt(tab.ordinal)?.select()
+		setAdapter()
+	}
+
+	private fun tabChanged(index: Int) {
+		this.currentTab = Tab.values()[index]
+		setAdapter()
+	}
+
+	private fun setAdapter() {
+		when (this.currentTab) {
+			Tab.SESSIONS -> menuRecyclerView.adapter = feedSessionAdapter
+			Tab.TRANSACTIONS -> menuRecyclerView.adapter = feedTransactionAdapter
+		}
 	}
 
 }
\ No newline at end of file