diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBAlarm.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBAlarm.java
index e53b71f23..7c542a4d6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBAlarm.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBAlarm.java
@@ -190,6 +190,7 @@ public class GBAlarm implements Parcelable, Comparable {
             String alarmString = iterator.next();
             if(this.equals(new GBAlarm(alarmString))) {
                 iterator.remove();
+                break;
             }
         }
         newPrefs.add(this.toPreferences());
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBAlarmListAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBAlarmListAdapter.java
index 3952647f1..3abf16221 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBAlarmListAdapter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBAlarmListAdapter.java
@@ -40,13 +40,8 @@ public class GBAlarmListAdapter extends ArrayAdapter<GBAlarm> {
         this.mContext = context;
         alarmList = new ArrayList<GBAlarm>();
 
-        if (preferencesAlarmListSet != null) {
-            Iterator<String> iterator = preferencesAlarmListSet.iterator();
-
-            while (iterator.hasNext()) {
-                String alarmString = iterator.next();
-                alarmList.add(new GBAlarm(alarmString));
-            }
+        for  (String alarmString : preferencesAlarmListSet) {
+            alarmList.add(new GBAlarm(alarmString));
         }
 
         Collections.sort(alarmList);
@@ -55,13 +50,8 @@ public class GBAlarmListAdapter extends ArrayAdapter<GBAlarm> {
     public void setAlarmList(Set<String> preferencesAlarmListSet) {
         alarmList = new ArrayList<GBAlarm>();
 
-        if (preferencesAlarmListSet != null) {
-            Iterator<String> iterator = preferencesAlarmListSet.iterator();
-
-            while (iterator.hasNext()) {
-                String alarmString = iterator.next();
-                alarmList.add(new GBAlarm(alarmString));
-            }
+        for  (String alarmString : preferencesAlarmListSet) {
+            alarmList.add(new GBAlarm(alarmString));
         }
 
         Collections.sort(alarmList);