diff --git a/data/resources/ui/content-message-media.ui b/data/resources/ui/content-message-media.ui
index 1dea2197..1eca8367 100644
--- a/data/resources/ui/content-message-media.ui
+++ b/data/resources/ui/content-message-media.ui
@@ -15,7 +15,7 @@
           </object>
         </child>
         <child type="overlay">
-          <object class="GtkSpinner" id="overlay_spinner">
+          <object class="Spinner" id="overlay_spinner">
             <property name="halign">center</property>
             <property name="valign">center</property>
             <layout>
diff --git a/src/session/content/room_history/message_row/media.rs b/src/session/content/room_history/message_row/media.rs
index 12ecec6b..af5f5c49 100644
--- a/src/session/content/room_history/message_row/media.rs
+++ b/src/session/content/room_history/message_row/media.rs
@@ -19,7 +19,7 @@ use matrix_sdk::{
 
 use super::ContentFormat;
 use crate::{
-    components::{ImagePaintable, VideoPlayer},
+    components::{ImagePaintable, Spinner, VideoPlayer},
     session::Session,
     spawn, spawn_tokio,
     utils::{cache_dir, media::media_type_uid, uint_to_i32},
@@ -76,7 +76,7 @@ mod imp {
         #[template_child]
         pub overlay_error: TemplateChild<gtk::Image>,
         #[template_child]
-        pub overlay_spinner: TemplateChild<gtk::Spinner>,
+        pub overlay_spinner: TemplateChild<Spinner>,
     }
 
     #[glib::object_subclass]