diff --git a/src/ephy-history-dialog.c b/src/ephy-history-dialog.c
index 3237846e438298068b935e4e6b90851f45fb19d8..42ab779089d31eba0881c0f6e7034ea510bcce01 100644
--- a/src/ephy-history-dialog.c
+++ b/src/ephy-history-dialog.c
@@ -111,7 +111,6 @@ update_ui_state (EphyHistoryDialog *self)
 
   if (self->is_loading) {
     gtk_stack_set_visible_child (history_presentation_stack, self->loading_spinner);
-    gtk_spinner_start (GTK_SPINNER (self->loading_spinner));
   } else {
     if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (self->search_button))) {
       if (has_data && self->has_search_results)
@@ -124,7 +123,6 @@ update_ui_state (EphyHistoryDialog *self)
       else
         gtk_stack_set_visible_child (history_presentation_stack, self->empty_history_message);
     }
-    gtk_spinner_stop (GTK_SPINNER (self->loading_spinner));
   }
 
   if (self->selection_active) {
diff --git a/src/preferences/ephy-data-view.c b/src/preferences/ephy-data-view.c
index d82281aae1520be10ee7bdddd6ee36ce1c706032..535538d395383218d3af34263a9e6176af267725 100644
--- a/src/preferences/ephy-data-view.c
+++ b/src/preferences/ephy-data-view.c
@@ -86,7 +86,6 @@ update (EphyDataView *self)
 
   if (priv->is_loading) {
     gtk_stack_set_visible_child_name (GTK_STACK (priv->stack), "loading");
-    gtk_spinner_start (GTK_SPINNER (priv->spinner));
   } else {
     if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->search_button))) {
       if (has_data && priv->has_search_results)
@@ -99,7 +98,6 @@ update (EphyDataView *self)
       else
         gtk_stack_set_visible_child_name (GTK_STACK (priv->stack), "empty");
     }
-    gtk_spinner_stop (GTK_SPINNER (priv->spinner));
   }
 
   gtk_widget_set_sensitive (priv->clear_button, has_data && priv->can_clear);
diff --git a/src/resources/gtk/data-view.ui b/src/resources/gtk/data-view.ui
index 0b04afbcf842a07da0b762441b3e4fce3f4b013e..dc14e0ea0fa0488be12af6ae1357cc9057c763a7 100644
--- a/src/resources/gtk/data-view.ui
+++ b/src/resources/gtk/data-view.ui
@@ -40,7 +40,7 @@
               <object class="GtkStackPage">
                 <property name="name">loading</property>
                 <property name="child">
-                  <object class="GtkSpinner" id="spinner">
+                  <object class="AdwSpinner" id="spinner">
                     <property name="halign">center</property>
                     <property name="valign">center</property>
                     <property name="width-request">32</property>
diff --git a/src/resources/gtk/history-dialog.ui b/src/resources/gtk/history-dialog.ui
index 8b2a53e6c0273849c150b2f41d3ffb286974a4ee..a011df20db8227d09248686a6f40fe9f21c6223b 100644
--- a/src/resources/gtk/history-dialog.ui
+++ b/src/resources/gtk/history-dialog.ui
@@ -115,7 +115,7 @@
               </object>
             </child>
             <child>
-              <object class="GtkSpinner" id="loading_spinner">
+              <object class="AdwSpinner" id="loading_spinner">
                 <property name="halign">center</property>
                 <property name="valign">center</property>
                 <property name="width-request">32</property>