diff --git a/app/src/main/java/org/oppia/android/app/classroom/ClassroomListActivity.kt b/app/src/main/java/org/oppia/android/app/classroom/ClassroomListActivity.kt
index f6160ec4ba7..5eeb5f498d1 100644
--- a/app/src/main/java/org/oppia/android/app/classroom/ClassroomListActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/classroom/ClassroomListActivity.kt
@@ -47,7 +47,7 @@ class ClassroomListActivity :
   @Inject
   lateinit var activityRouter: ActivityRouter
 
-  private var internalProfileId: Int = -1
+  private lateinit var profileId: ProfileId
 
   @Inject
   @field:EnableOnboardingFlowV2
@@ -67,7 +67,7 @@ class ClassroomListActivity :
     super.onCreate(savedInstanceState)
     (activityComponent as ActivityComponentImpl).inject(this)
 
-    internalProfileId = intent.extractCurrentUserProfileId().internalId
+    profileId = intent.extractCurrentUserProfileId()
     classroomListActivityPresenter.handleOnCreate()
     title = resourceHandler.getStringInLocale(R.string.classroom_list_activity_title)
   }
@@ -92,7 +92,7 @@ class ClassroomListActivity :
     val recentlyPlayedActivityParams =
       RecentlyPlayedActivityParams
         .newBuilder()
-        .setProfileId(ProfileId.newBuilder().setInternalId(internalProfileId).build())
+        .setProfileId(profileId)
         .setActivityTitle(recentlyPlayedActivityTitle).build()
 
     activityRouter.routeToScreen(
diff --git a/app/src/main/java/org/oppia/android/app/classroom/ClassroomListFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/classroom/ClassroomListFragmentPresenter.kt
index b0ab600338e..a385a9ff2b9 100644
--- a/app/src/main/java/org/oppia/android/app/classroom/ClassroomListFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/classroom/ClassroomListFragmentPresenter.kt
@@ -99,7 +99,6 @@ class ClassroomListFragmentPresenter @Inject constructor(
   private val exitProfileListener = activity as ExitProfileListener
   private lateinit var binding: ClassroomListFragmentBinding
   private lateinit var classroomListViewModel: ClassroomListViewModel
-  private var internalProfileId: Int = -1
   private val profileId = activity.intent.extractCurrentUserProfileId()
   private var onBackPressedCallback: OnBackPressedCallback? = null
 
@@ -111,15 +110,13 @@ class ClassroomListFragmentPresenter @Inject constructor(
       /* attachToRoot= */ false
     )
 
-    internalProfileId = profileId.internalId
-
     logHomeActivityEvent()
 
     classroomListViewModel = ClassroomListViewModel(
       activity,
       fragment,
       oppiaLogger,
-      internalProfileId,
+      profileId,
       profileManagementController,
       topicListController,
       classroomController,
@@ -177,7 +174,7 @@ class ClassroomListFragmentPresenter @Inject constructor(
   /** Routes to the play story view for the first story in the given topic summary. */
   fun onTopicSummaryClicked(topicSummary: TopicSummary) {
     routeToTopicPlayStoryListener.routeToTopicPlayStory(
-      internalProfileId,
+      profileId.internalId,
       topicSummary.classroomId,
       topicSummary.topicId,
       topicSummary.firstStoryId
diff --git a/app/src/main/java/org/oppia/android/app/classroom/ClassroomListViewModel.kt b/app/src/main/java/org/oppia/android/app/classroom/ClassroomListViewModel.kt
index 8211e52529b..985ed3816c9 100644
--- a/app/src/main/java/org/oppia/android/app/classroom/ClassroomListViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/classroom/ClassroomListViewModel.kt
@@ -53,7 +53,7 @@ class ClassroomListViewModel(
   private val activity: AppCompatActivity,
   private val fragment: Fragment,
   private val oppiaLogger: OppiaLogger,
-  private val internalProfileId: Int,
+  private val profileId: ProfileId,
   private val profileManagementController: ProfileManagementController,
   private val topicListController: TopicListController,
   private val classroomController: ClassroomController,
@@ -63,7 +63,7 @@ class ClassroomListViewModel(
   private val dateTimeUtil: DateTimeUtil,
   private val translationController: TranslationController
 ) : ObservableViewModel() {
-  private val profileId: ProfileId = ProfileId.newBuilder().setInternalId(internalProfileId).build()
+
   private val promotedStoryListLimit = activity.resources.getInteger(
     R.integer.promoted_story_list_limit
   )
@@ -226,7 +226,7 @@ class ClassroomListViewModel(
         .mapIndexed { index, promotedStory ->
           PromotedStoryViewModel(
             activity,
-            internalProfileId,
+            profileId.internalId,
             sortedStoryList.size,
             storyEntityType,
             promotedStory,