diff --git a/app/src/main/java/com/keylesspalace/tusky/components/compose/dialog/FocusDialog.kt b/app/src/main/java/com/keylesspalace/tusky/components/compose/dialog/FocusDialog.kt
index 93c99ee6f..e6abea84e 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/compose/dialog/FocusDialog.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/compose/dialog/FocusDialog.kt
@@ -49,12 +49,12 @@ fun <T> T.makeFocusDialog(
         .load(previewUri)
         .downsample(DownsampleStrategy.CENTER_INSIDE)
         .listener(object : RequestListener<Drawable> {
-            override fun onLoadFailed(p0: GlideException?, p1: Any?, p2: Target<Drawable?>?, p3: Boolean): Boolean {
+            override fun onLoadFailed(p0: GlideException?, p1: Any?, p2: Target<Drawable?>, p3: Boolean): Boolean {
                 return false
             }
 
-            override fun onResourceReady(resource: Drawable?, model: Any?, target: Target<Drawable?>?, dataSource: DataSource?, isFirstResource: Boolean): Boolean {
-                val width = resource!!.intrinsicWidth
+            override fun onResourceReady(resource: Drawable, model: Any, target: Target<Drawable?>?, dataSource: DataSource, isFirstResource: Boolean): Boolean {
+                val width = resource.intrinsicWidth
                 val height = resource.intrinsicHeight
 
                 dialogBinding.focusIndicator.setImageSize(width, height)
diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/ViewImageFragment.kt b/app/src/main/java/com/keylesspalace/tusky/fragment/ViewImageFragment.kt
index bbbfdf219..2b7010329 100644
--- a/app/src/main/java/com/keylesspalace/tusky/fragment/ViewImageFragment.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/fragment/ViewImageFragment.kt
@@ -306,7 +306,7 @@ class ViewImageFragment : ViewMediaFragment() {
 
         override fun onLoadFailed(
             e: GlideException?,
-            model: Any,
+            model: Any?,
             target: Target<Drawable>,
             isFirstResource: Boolean
         ): Boolean {
diff --git a/app/src/main/java/com/keylesspalace/tusky/view/MediaPreviewImageView.kt b/app/src/main/java/com/keylesspalace/tusky/view/MediaPreviewImageView.kt
index 717bd1441..cf400a8f2 100644
--- a/app/src/main/java/com/keylesspalace/tusky/view/MediaPreviewImageView.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/view/MediaPreviewImageView.kt
@@ -96,11 +96,11 @@ open class MediaPreviewImageView
         }
     }
 
-    override fun onLoadFailed(e: GlideException?, model: Any?, target: Target<Drawable>?, isFirstResource: Boolean): Boolean {
+    override fun onLoadFailed(e: GlideException?, model: Any?, target: Target<Drawable>, isFirstResource: Boolean): Boolean {
         return false
     }
 
-    override fun onResourceReady(resource: Drawable?, model: Any?, target: Target<Drawable>?, dataSource: DataSource?, isFirstResource: Boolean): Boolean {
+    override fun onResourceReady(resource: Drawable, model: Any, target: Target<Drawable>?, dataSource: DataSource, isFirstResource: Boolean): Boolean {
         recalculateMatrix(width, height, resource)
         return false
     }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0777ecdc4..3c51adfbb 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -30,7 +30,7 @@ diffx = "1.1.1"
 emoji2 = "1.3.0"
 espresso = "3.5.1"
 filemoji-compat = "3.2.7"
-glide = "4.15.1"
+glide = "4.16.0"
 # Deliberate downgrade, https://github.com/tuskyapp/Tusky/issues/3631
 glide-animation-plugin = "2.23.0"
 gson = "2.10.1"