diff --git a/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java
index 36423a327..c503fe85d 100644
--- a/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java
+++ b/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java
@@ -70,6 +70,7 @@ import java.util.TimerTask;
 
 import app.fedilab.android.R;
 import app.fedilab.android.activities.AccountReportActivity;
+import app.fedilab.android.activities.BaseActivity;
 import app.fedilab.android.activities.BaseMainActivity;
 import app.fedilab.android.activities.CustomSharingActivity;
 import app.fedilab.android.activities.MainActivity;
@@ -1481,10 +1482,10 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On
             final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
             boolean disableAnimatedEmoji = sharedpreferences.getBoolean(Helper.SET_DISABLE_ANIMATED_EMOJI, false);
             if (!disableAnimatedEmoji) {
-                if (BaseMainActivity.timer == null) {
-                    BaseMainActivity.timer = new Timer();
+                if (BaseActivity.timer == null) {
+                    BaseActivity.timer = new Timer();
                 }
-                BaseMainActivity.timer.schedule(new TimerTask() {
+                BaseActivity.timer.schedule(new TimerTask() {
                     @Override
                     public void run() {
                         mHandler.post(updateAnimatedEmoji);
diff --git a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
index 955779504..7001adb6b 100644
--- a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
+++ b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
@@ -117,6 +117,7 @@ import java.util.regex.Pattern;
 
 import app.fedilab.android.R;
 import app.fedilab.android.activities.AccountReportActivity;
+import app.fedilab.android.activities.BaseActivity;
 import app.fedilab.android.activities.BaseMainActivity;
 import app.fedilab.android.activities.CustomSharingActivity;
 import app.fedilab.android.activities.MainActivity;
@@ -4516,10 +4517,10 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
             final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
             boolean disableAnimatedEmoji = sharedpreferences.getBoolean(Helper.SET_DISABLE_ANIMATED_EMOJI, false);
             if (!disableAnimatedEmoji) {
-                if (BaseMainActivity.timer == null) {
-                    BaseMainActivity.timer = new Timer();
+                if (BaseActivity.timer == null) {
+                    BaseActivity.timer = new Timer();
                 }
-                BaseMainActivity.timer.schedule(new TimerTask() {
+                BaseActivity.timer.schedule(new TimerTask() {
                     @Override
                     public void run() {
                         mHandler.post(updateAnimatedEmoji);