diff --git a/app/src/androidTest/java/fr/free/nrw/commons/AboutActivityTest.kt b/app/src/androidTest/java/fr/free/nrw/commons/AboutActivityTest.kt
index b5a752ef9..45ff9e49d 100644
--- a/app/src/androidTest/java/fr/free/nrw/commons/AboutActivityTest.kt
+++ b/app/src/androidTest/java/fr/free/nrw/commons/AboutActivityTest.kt
@@ -105,7 +105,7 @@ class AboutActivityTest {
     fun testLaunchTranslate() {
         Espresso.onView(ViewMatchers.withId(R.id.about_translate)).perform(ViewActions.click())
         Espresso.onView(ViewMatchers.withId(android.R.id.button1)).perform(ViewActions.click())
-        val langCode = CommonsApplication.getInstance().languageLookUpTable.codes[0]
+        val langCode = CommonsApplication.instance.languageLookUpTable!!.codes[0]
         Intents.intended(
             CoreMatchers.allOf(
                 IntentMatchers.hasAction(Intent.ACTION_VIEW),
diff --git a/app/src/main/java/fr/free/nrw/commons/CommonsApplication.kt b/app/src/main/java/fr/free/nrw/commons/CommonsApplication.kt
index 2c5093f80..d44ba30c0 100644
--- a/app/src/main/java/fr/free/nrw/commons/CommonsApplication.kt
+++ b/app/src/main/java/fr/free/nrw/commons/CommonsApplication.kt
@@ -85,7 +85,6 @@ class CommonsApplication : MultiDexApplication() {
     @Inject
     lateinit var customOkHttpNetworkFetcher: CustomOkHttpNetworkFetcher
 
-    //TODO [parry] not being used anywhere, remove after checking
     var languageLookUpTable: AppLanguageLookUpTable? = null
         private set
 
@@ -385,7 +384,9 @@ class CommonsApplication : MultiDexApplication() {
         /**
          * Constants End
          */
-        var instance: CommonsApplication? = null
+
+        @JvmStatic
+        lateinit var instance: CommonsApplication
             private set
 
         @JvmField
diff --git a/app/src/main/java/fr/free/nrw/commons/actions/ThanksClient.kt b/app/src/main/java/fr/free/nrw/commons/actions/ThanksClient.kt
index de716db99..af305c9c6 100644
--- a/app/src/main/java/fr/free/nrw/commons/actions/ThanksClient.kt
+++ b/app/src/main/java/fr/free/nrw/commons/actions/ThanksClient.kt
@@ -32,7 +32,7 @@ class ThanksClient
                         revisionId.toString(), // Rev
                         null, // Log
                         csrfTokenClient.getTokenBlocking(), // Token
-                        CommonsApplication.getInstance().userAgent, // Source
+                        CommonsApplication.instance.userAgent, // Source
                     ).map { mwThankPostResponse ->
                         mwThankPostResponse.result?.success == 1
                     }
diff --git a/app/src/main/java/fr/free/nrw/commons/description/DescriptionEditActivity.kt b/app/src/main/java/fr/free/nrw/commons/description/DescriptionEditActivity.kt
index cfd7f36b9..7ed598637 100644
--- a/app/src/main/java/fr/free/nrw/commons/description/DescriptionEditActivity.kt
+++ b/app/src/main/java/fr/free/nrw/commons/description/DescriptionEditActivity.kt
@@ -258,7 +258,7 @@ class DescriptionEditActivity :
                     username,
                 )
 
-            val commonsApplication = CommonsApplication.getInstance()
+            val commonsApplication = CommonsApplication.instance
             if (commonsApplication != null) {
                 commonsApplication.clearApplicationData(this, logoutListener)
             }
@@ -291,7 +291,7 @@ class DescriptionEditActivity :
                         username,
                     )
 
-                val commonsApplication = CommonsApplication.getInstance()
+                val commonsApplication = CommonsApplication.instance
                 if (commonsApplication != null) {
                     commonsApplication.clearApplicationData(this, logoutListener)
                 }
diff --git a/app/src/test/kotlin/fr/free/nrw/commons/actions/ThanksClientTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/actions/ThanksClientTest.kt
index d409016ae..9cfe85bd1 100644
--- a/app/src/test/kotlin/fr/free/nrw/commons/actions/ThanksClientTest.kt
+++ b/app/src/test/kotlin/fr/free/nrw/commons/actions/ThanksClientTest.kt
@@ -39,7 +39,7 @@ class ThanksClientTest {
     fun setUp() {
         MockitoAnnotations.openMocks(this)
         mockedApplication = Mockito.mockStatic(CommonsApplication::class.java)
-        `when`(CommonsApplication.getInstance()).thenReturn(commonsApplication)
+        `when`(CommonsApplication.instance).thenReturn(commonsApplication)
         thanksClient = ThanksClient(csrfTokenClient, service)
     }