diff --git a/build.gradle b/build.gradle
index 4822d4bd377f..66b7bc988ff2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -247,9 +247,9 @@ dependencies {
     // dependencies for app building
     implementation 'androidx.multidex:multidex:2.0.1'
 //    implementation project('nextcloud-android-library')
-    genericImplementation 'com.github.nextcloud:android-library:master-SNAPSHOT'
-    gplayImplementation 'com.github.nextcloud:android-library:master-SNAPSHOT'
-    versionDevImplementation 'com.github.nextcloud:android-library:master-SNAPSHOT'
+    genericImplementation 'com.github.nextcloud:android-library:1.4.0'
+    gplayImplementation 'com.github.nextcloud:android-library:1.4.0'
+    versionDevImplementation 'com.github.nextcloud:android-library:1.4.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'com.google.android.material:material:1.0.0'
diff --git a/src/main/java/com/owncloud/android/MainApp.java b/src/main/java/com/owncloud/android/MainApp.java
index 11940eedfcba..4bd1f5a6a839 100644
--- a/src/main/java/com/owncloud/android/MainApp.java
+++ b/src/main/java/com/owncloud/android/MainApp.java
@@ -164,9 +164,17 @@ public class MainApp extends MultiDexApplication implements
     @SuppressWarnings("unused")
     private boolean mBound;
 
+    /**
+     * Temporary hack
+     */
+    private static void initGlobalContext(Context context) {
+        mContext = context;
+    }
+
     @Override
     protected void attachBaseContext(Context base) {
         super.attachBaseContext(base);
+        initGlobalContext(this);
         DaggerAppComponent.builder()
             .application(this)
             .build()
@@ -188,7 +196,6 @@ public void onCreate() {
                 uploadsStorageManager
             )
         );
-        MainApp.mContext = getApplicationContext();
 
         new SecurityUtils();
         DisplayUtils.useCompatVectorIfNeeded();