diff --git a/app/src/main/java/org/pixeldroid/app/main/MainActivity.kt b/app/src/main/java/org/pixeldroid/app/main/MainActivity.kt
index 11327db4..9a57d5b3 100644
--- a/app/src/main/java/org/pixeldroid/app/main/MainActivity.kt
+++ b/app/src/main/java/org/pixeldroid/app/main/MainActivity.kt
@@ -73,7 +73,6 @@ import org.pixeldroid.app.posts.feeds.uncachedFeeds.UncachedPostsFragment
 import org.pixeldroid.app.profile.ProfileActivity
 import org.pixeldroid.app.searchDiscover.SearchDiscoverFragment
 import org.pixeldroid.app.settings.SettingsActivity
-import org.pixeldroid.app.settings.SettingsActivity.SettingsFragment
 import org.pixeldroid.app.settings.TutorialSettingsDialog.Companion.START_TUTORIAL
 import org.pixeldroid.app.utils.BaseActivity
 import org.pixeldroid.app.utils.Tab
@@ -704,7 +703,9 @@ class MainActivity : BaseActivity() {
                         }
                 } }
                 Tab.SEARCH_DISCOVER_FEED -> { { SearchDiscoverFragment() } }
-                Tab.CREATE_FEED -> { { CameraFragment() } }
+                Tab.CREATE_FEED -> { { CameraFragment().apply {
+                    arguments = Bundle().apply { putInt(START_TUTORIAL, intent.getIntExtra(START_TUTORIAL, -1)) }
+                } } }
                 Tab.NOTIFICATIONS_FEED -> { { NotificationsFragment() } }
                 Tab.PUBLIC_FEED -> { {
                     PostFeedFragment<PublicFeedStatusDatabaseEntity>()
diff --git a/app/src/main/java/org/pixeldroid/app/postCreation/PostCreationActivity.kt b/app/src/main/java/org/pixeldroid/app/postCreation/PostCreationActivity.kt
index afb5fa62..e0f99a82 100644
--- a/app/src/main/java/org/pixeldroid/app/postCreation/PostCreationActivity.kt
+++ b/app/src/main/java/org/pixeldroid/app/postCreation/PostCreationActivity.kt
@@ -16,6 +16,7 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import org.pixeldroid.app.R
 import org.pixeldroid.app.databinding.ActivityPostCreationBinding
+import org.pixeldroid.app.settings.TutorialSettingsDialog.Companion.START_TUTORIAL
 import org.pixeldroid.app.utils.BaseActivity
 
 class PostCreationActivity : BaseActivity() {
@@ -66,7 +67,7 @@ class PostCreationActivity : BaseActivity() {
         navController = navHostFragment.navController
         navController.setGraph(R.navigation.post_creation_graph)
 
-        lifecycleScope.launch {
+        if(intent.getBooleanExtra(START_TUTORIAL, false)) lifecycleScope.launch {
             var targetCamera = findViewById<View>(R.id.toggleStoryPost)
             while (targetCamera == null) {
                 targetCamera = findViewById(R.id.toggleStoryPost)