diff --git a/src/main/java/org/tasks/activities/TimePickerActivity.java b/src/main/java/org/tasks/activities/TimePickerActivity.java
index 7faae485a..6a5ab0ad8 100644
--- a/src/main/java/org/tasks/activities/TimePickerActivity.java
+++ b/src/main/java/org/tasks/activities/TimePickerActivity.java
@@ -23,6 +23,7 @@ public class TimePickerActivity extends FragmentActivity implements TimePickerDi
     public static final String EXTRA_TIMESTAMP = "extra_timestamp";
 
     private DateTime initial;
+    private boolean isChangingConfigurations;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -52,9 +53,16 @@ public class TimePickerActivity extends FragmentActivity implements TimePickerDi
         }});
     }
 
+    @Override
+    public Object onRetainCustomNonConfigurationInstance() {
+        isChangingConfigurations = true;
+        return super.onRetainCustomNonConfigurationInstance();
+    }
+
     @Override
     public void onDismiss(DialogInterface dialog) {
-        if (isChangingConfigurations()) {
+        if (isChangingConfigurations) {
+            isChangingConfigurations = false;
             return;
         }
         finish();