diff --git a/app/build.gradle b/app/build.gradle
index 7e57e15..a5369b8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "com.vaccinenotifier"
         minSdkVersion 26
         targetSdkVersion 30
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "1.1.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/java/com/vaccinenotifier/MainActivity.java b/app/src/main/java/com/vaccinenotifier/MainActivity.java
index 894beaa..0abcfe1 100644
--- a/app/src/main/java/com/vaccinenotifier/MainActivity.java
+++ b/app/src/main/java/com/vaccinenotifier/MainActivity.java
@@ -62,14 +62,17 @@ public void onNothingSelected(AdapterView<?> parent) {
             }
         });
         refreshAlertDetails();
-        scheduleAlarm();
     }
 
-    private void scheduleAlarm() {
+    private void scheduleAlarm(boolean enable) {
         Intent intent = new Intent(getApplicationContext(), BroadcastReceiverImpl.class);
         final PendingIntent pIntent = PendingIntent.getBroadcast(this, BroadcastReceiverImpl.REQUEST_CODE, intent, PendingIntent.FLAG_UPDATE_CURRENT);
         AlarmManager alarm = (AlarmManager) this.getSystemService(Context.ALARM_SERVICE);
-        alarm.setInexactRepeating(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime(), getResources().getInteger(R.integer.cronIntervalMs), pIntent);
+        if (enable) {
+            alarm.setInexactRepeating(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime(), getResources().getInteger(R.integer.cronIntervalMs), pIntent);
+        } else {
+            alarm.cancel(pIntent);
+        }
     }
 
     private void refreshAlertDetails() {
@@ -139,6 +142,7 @@ private void populateSharedPrefDataToUi(SlotConstraints slotConstraints) {
     private void enableSwitch(boolean isEnable) {
         SwitchCompat switchCompat = findViewById(R.id.alertSwitch);
         switchCompat.setChecked(isEnable);
+        scheduleAlarm(isEnable);
     }
 
     private void checkCheckBox(List<Integer> checkBoxIds) {
@@ -173,6 +177,7 @@ private void disableAlert() {
         getSharedPreferences(getString(R.string.alertsSharedPreferencesName), Context.MODE_PRIVATE).edit()
                 .putBoolean(SlotConstraints.Fields.isEnabled, false)
                 .apply();
+        Toast.makeText(MainActivity.this, getString(R.string.alertDisabled), Toast.LENGTH_SHORT).show();
     }
 
     public void switchListener(View view) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 40aa7c9..62235c2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -22,7 +22,7 @@
     <string name="defaultFeeType">Free,Paid</string>
     <string name="defaultDose">Dose1</string>
 
-    <integer name="cronIntervalMs">600000</integer>
+    <integer name="cronIntervalMs">60000</integer>
     <string name="alertsSharedPreferencesName">Alerts</string>
     <string name="availableCentersJson">availableCentersJson</string>
     <string name="centerViewTypeNotification">centerViewTypeNotification</string>
@@ -34,6 +34,7 @@
     <string name="createAlert">Create Alert</string>
     <string name="alertDetails"><b>No alerts set</b></string>
     <string name="alertCreated">Alert Created</string>
+    <string name="alertDisabled">Alert Disabled</string>
     <string name="districtEmpty">Please select district</string>
     <string name="centerNameDisplay">Center Name: %1$s</string>
     <string name="centerPincodeDisplay">Center Pincode: %1$s</string>