diff --git a/data/services/src/main/java/com/twofasapp/data/services/otp/OtpLinkParser.kt b/data/services/src/main/java/com/twofasapp/data/services/otp/OtpLinkParser.kt
index 27f55ebb..b8366713 100644
--- a/data/services/src/main/java/com/twofasapp/data/services/otp/OtpLinkParser.kt
+++ b/data/services/src/main/java/com/twofasapp/data/services/otp/OtpLinkParser.kt
@@ -55,7 +55,9 @@ object OtpLinkParser {
     private fun isAuthorityValid(uri: Uri) =
         uri.authority?.lowercase() == TOTP || uri.authority?.lowercase() == HOTP || uri.authority?.lowercase() == STEAM
 
-    private fun mapQueryParams(uri: Uri) = uri.queryParameterNames.associateWith { uri.getQueryParameter(it)!! }
+    private fun mapQueryParams(uri: Uri) = uri.queryParameterNames.associateWith {
+        uri.getQueryParameter(it) ?: "" // getQueryParameter() is nullable when parameters key contains semicolon
+    }
 
     private fun getPath(uri: Uri): String {
         if (uri.path == null) return ""