diff --git a/CHANGELOG.md b/CHANGELOG.md
index 767e9ac49..b3a95f41a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ###Changelog
 
+###Version next
+* Alarms activity improvements and fixes
+
 ###Version 0.18.3
 * Fix bug that caused the same value in weekly charts for every day on Android 6 and older
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AlarmDetails.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AlarmDetails.java
index 43744716a..d14db9dc6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AlarmDetails.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AlarmDetails.java
@@ -105,7 +105,7 @@ public class AlarmDetails extends GBActivity {
     }
 
     private void updateAlarm() {
-        alarm.setSmartWakeup(cbSmartWakeup.isChecked());
+        alarm.setSmartWakeup(supportsSmartWakeup() && cbSmartWakeup.isChecked());
         alarm.setRepetition(cbMonday.isChecked(), cbTuesday.isChecked(), cbWednesday.isChecked(), cbThursday.isChecked(), cbFriday.isChecked(), cbSaturday.isChecked(), cbSunday.isChecked());
         alarm.setHour(timePicker.getCurrentHour());
         alarm.setMinute(timePicker.getCurrentMinute());
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index e881747ab..22c00ad66 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+    <release version="next">
+        <change>Alarms activity improvements and fixes</change>
+    </release>
     <release version="0.18.3" versioncode="90">
         <change>Fix bug that caused the same value in weekly charts for every day on Android 6 and older</change>
     </release>