diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ConfigureReminders.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ConfigureReminders.java
index f62218c6c..2651a0a05 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ConfigureReminders.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ConfigureReminders.java
@@ -66,7 +66,7 @@ public class ConfigureReminders extends AbstractGBActivity {
     private static final int REQ_CONFIGURE_REMINDER = 1;
 
     private GBReminderListAdapter mGBReminderListAdapter;
-    public GBDevice gbDevice;
+    private GBDevice gbDevice;
 
     private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
         @Override
@@ -89,7 +89,7 @@ public class ConfigureReminders extends AbstractGBActivity {
 
         gbDevice = getIntent().getParcelableExtra(GBDevice.EXTRA_DEVICE);
 
-        mGBReminderListAdapter = new GBReminderListAdapter(this);
+        mGBReminderListAdapter = new GBReminderListAdapter(this, gbDevice.getDeviceCoordinator().getRemindersHaveTime());
 
         final RecyclerView remindersRecyclerView = findViewById(R.id.reminder_list);
         remindersRecyclerView.setHasFixedSize(true);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBReminderListAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBReminderListAdapter.java
index 57438156e..7163bdf6e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBReminderListAdapter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBReminderListAdapter.java
@@ -47,9 +47,11 @@ public class GBReminderListAdapter extends RecyclerView.Adapter<GBReminderListAd
 
     private final Context mContext;
     private ArrayList<Reminder> reminderList;
+    private boolean remindersHaveTime;
 
-    public GBReminderListAdapter(Context context) {
+    public GBReminderListAdapter(Context context, boolean remindersHaveTime) {
         this.mContext = context;
+        this.remindersHaveTime = remindersHaveTime;
     }
 
     public void setReminderList(List<Reminder> reminders) {
@@ -101,7 +103,7 @@ public class GBReminderListAdapter extends RecyclerView.Adapter<GBReminderListAd
 
         final Date time = reminder.getDate();
         SimpleDateFormat format;
-        if (((ConfigureReminders) mContext).gbDevice.getDeviceCoordinator().getRemindersHaveTime()) {
+        if (remindersHaveTime) {
             format = new SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.getDefault());
         } else {
             format = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault());