diff --git a/android/src/main/java/com/reactcommunity/rndatetimepicker/RNDatePickerDialogModule.java b/android/src/main/java/com/reactcommunity/rndatetimepicker/RNDatePickerDialogModule.java
index 9c95d841..c41be3d4 100644
--- a/android/src/main/java/com/reactcommunity/rndatetimepicker/RNDatePickerDialogModule.java
+++ b/android/src/main/java/com/reactcommunity/rndatetimepicker/RNDatePickerDialogModule.java
@@ -127,22 +127,18 @@ public void open(@Nullable final ReadableMap options, final Promise promise) {
     }
 
     final FragmentManager fragmentManager = activity.getSupportFragmentManager();
-    final RNDatePickerDialogFragment oldFragment = (RNDatePickerDialogFragment) fragmentManager.findFragmentByTag(FRAGMENT_TAG);
-
-    if (oldFragment != null && options != null) {
-      UiThreadUtil.runOnUiThread(new Runnable() {
-        @Override
-        public void run() {
-          oldFragment.update(createFragmentArguments(options));
-        }
-      });
-
-      return;
-    }
 
     UiThreadUtil.runOnUiThread(new Runnable() {
       @Override
       public void run() {
+        RNDatePickerDialogFragment oldFragment =
+                (RNDatePickerDialogFragment) fragmentManager.findFragmentByTag(FRAGMENT_TAG);
+
+        if (oldFragment != null && options != null) {
+          oldFragment.update(createFragmentArguments(options));
+          return;
+        }
+
         RNDatePickerDialogFragment fragment = new RNDatePickerDialogFragment();
 
         if (options != null) {
diff --git a/android/src/main/java/com/reactcommunity/rndatetimepicker/RNTimePickerDialogModule.java b/android/src/main/java/com/reactcommunity/rndatetimepicker/RNTimePickerDialogModule.java
index 89b5ff7f..05abbfc3 100644
--- a/android/src/main/java/com/reactcommunity/rndatetimepicker/RNTimePickerDialogModule.java
+++ b/android/src/main/java/com/reactcommunity/rndatetimepicker/RNTimePickerDialogModule.java
@@ -104,22 +104,18 @@ public void open(@Nullable final ReadableMap options, final Promise promise) {
     // We want to support both android.app.Activity and the pre-Honeycomb FragmentActivity
     // (for apps that use it for legacy reasons). This unfortunately leads to some code duplication.
     final FragmentManager fragmentManager = activity.getSupportFragmentManager();
-    final RNTimePickerDialogFragment oldFragment = (RNTimePickerDialogFragment) fragmentManager.findFragmentByTag(FRAGMENT_TAG);
-
-    if (oldFragment != null && options != null) {
-      UiThreadUtil.runOnUiThread(new Runnable() {
-        @Override
-        public void run() {
-          oldFragment.update(createFragmentArguments(options));
-        }
-      });
-
-      return;
-    }
 
     UiThreadUtil.runOnUiThread(new Runnable() {
       @Override
       public void run() {
+        RNTimePickerDialogFragment oldFragment =
+                (RNTimePickerDialogFragment) fragmentManager.findFragmentByTag(FRAGMENT_TAG);
+
+        if (oldFragment != null && options != null) {
+          oldFragment.update(createFragmentArguments(options));
+          return;
+        }
+
         RNTimePickerDialogFragment fragment = new RNTimePickerDialogFragment();
 
         if (options != null) {