diff --git a/gradle.properties b/gradle.properties
index 59c82b5..1bac71f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,7 +19,7 @@ android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 GROUP=gun0912.ted
-VERSION_NAME=1.1.5
+VERSION_NAME=1.1.6
 DEVELOPER_ID='gun0912'
 DEVELOPER_NAME='Ted Park'
 SITE_URL='https://github.com/ParkSangGwon/TedImagePicker'
diff --git a/tedimagepicker/src/main/AndroidManifest.xml b/tedimagepicker/src/main/AndroidManifest.xml
index 6caec93..df8e3b3 100644
--- a/tedimagepicker/src/main/AndroidManifest.xml
+++ b/tedimagepicker/src/main/AndroidManifest.xml
@@ -21,6 +21,11 @@
             android:name=".zoom.TedImageZoomActivity"
             android:theme="@style/TedImagePickerTheme.Zoom" />
 
+        <provider
+            android:name=".util.TedImagePickerContentProvider"
+            android:authorities="gun0912.tedimagepicker.provider"
+            android:exported="false" />
+
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"
diff --git a/tedimagepicker/src/main/java/gun0912/tedimagepicker/builder/TedImagePickerBaseBuilder.kt b/tedimagepicker/src/main/java/gun0912/tedimagepicker/builder/TedImagePickerBaseBuilder.kt
index 765576e..3b3abc2 100644
--- a/tedimagepicker/src/main/java/gun0912/tedimagepicker/builder/TedImagePickerBaseBuilder.kt
+++ b/tedimagepicker/src/main/java/gun0912/tedimagepicker/builder/TedImagePickerBaseBuilder.kt
@@ -87,7 +87,6 @@ open class TedImagePickerBaseBuilder<out B : TedImagePickerBaseBuilder<B>>(
 
     @SuppressLint("CheckResult")
     protected fun startInternal(context: Context) {
-        ToastUtil.context = context
         checkPermission(context)
             .subscribe({ permissionResult ->
                 if (permissionResult.isGranted) {
diff --git a/tedimagepicker/src/main/java/gun0912/tedimagepicker/util/TedImagePickerContentProvider.kt b/tedimagepicker/src/main/java/gun0912/tedimagepicker/util/TedImagePickerContentProvider.kt
new file mode 100644
index 0000000..444209f
--- /dev/null
+++ b/tedimagepicker/src/main/java/gun0912/tedimagepicker/util/TedImagePickerContentProvider.kt
@@ -0,0 +1,45 @@
+package gun0912.tedimagepicker.util
+
+import android.app.Application
+import android.content.ContentProvider
+import android.content.ContentValues
+import android.database.Cursor
+import android.net.Uri
+
+class TedImagePickerContentProvider : ContentProvider() {
+    override fun onCreate(): Boolean {
+        ToastUtil.context = context as Application
+        return true
+    }
+
+    override fun insert(uri: Uri, values: ContentValues?): Uri? {
+        throw UnsupportedOperationException()
+    }
+
+    override fun query(
+        uri: Uri,
+        projection: Array<out String>?,
+        selection: String?,
+        selectionArgs: Array<out String>?,
+        sortOrder: String?
+    ): Cursor? {
+        throw UnsupportedOperationException()
+    }
+
+    override fun update(
+        uri: Uri,
+        values: ContentValues?,
+        selection: String?,
+        selectionArgs: Array<out String>?
+    ): Int {
+        throw UnsupportedOperationException()
+    }
+
+    override fun delete(uri: Uri, selection: String?, selectionArgs: Array<out String>?): Int {
+        throw UnsupportedOperationException()
+    }
+
+    override fun getType(uri: Uri): String {
+        throw UnsupportedOperationException()
+    }
+}