diff --git a/app/src/main/java/com/nextcloud/client/errorhandling/ShowErrorActivity.kt b/app/src/main/java/com/nextcloud/client/errorhandling/ShowErrorActivity.kt
index 2010d95d3764..61a98054ac20 100644
--- a/app/src/main/java/com/nextcloud/client/errorhandling/ShowErrorActivity.kt
+++ b/app/src/main/java/com/nextcloud/client/errorhandling/ShowErrorActivity.kt
@@ -17,7 +17,6 @@ import com.owncloud.android.R
 import com.owncloud.android.databinding.ActivityShowErrorBinding
 import com.owncloud.android.utils.ClipboardUtil
 import com.owncloud.android.utils.DisplayUtils
-import java.net.URLEncoder
 
 class ShowErrorActivity : AppCompatActivity() {
     private lateinit var binding: ActivityShowErrorBinding
@@ -51,10 +50,7 @@ class ShowErrorActivity : AppCompatActivity() {
 
     private fun reportIssue() {
         ClipboardUtil.copyToClipboard(this, binding.textViewError.text.toString(), false)
-        val issueLink = String.format(
-            getString(R.string.report_issue_link),
-            URLEncoder.encode(binding.textViewError.text.toString(), Charsets.UTF_8.name())
-        )
+        val issueLink = getString(R.string.report_issue_link)
         DisplayUtils.startLinkIntent(this, issueLink)
         Toast.makeText(this, R.string.copied_to_clipboard, Toast.LENGTH_LONG).show()
     }
diff --git a/app/src/main/res/values/setup.xml b/app/src/main/res/values/setup.xml
index 3b6c7532937e..095d401dd3de 100644
--- a/app/src/main/res/values/setup.xml
+++ b/app/src/main/res/values/setup.xml
@@ -113,7 +113,7 @@
     <string name="translation_link" translatable="false">https://app.transifex.com/nextcloud/nextcloud/android/</string>
     <string name="contributing_link" translatable="false">https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md</string>
     <!-- For semi-automated bug report creation -->
-    <string name="report_issue_link" translatable="false">https://github.com/nextcloud/android/issues/new?labels=bug&amp;body=%1$s</string>
+    <string name="report_issue_link" translatable="false">https://github.com/nextcloud/android/issues/new?template=bug_report.yml</string>
     <!-- For manual report from user -->
     <string name="report_issue_empty_link" translatable="false">https://github.com/nextcloud/android/issues/new/choose</string>