diff --git a/efficientdet/dataloader.py b/efficientdet/dataloader.py
index ddec16455..c293af3af 100644
--- a/efficientdet/dataloader.py
+++ b/efficientdet/dataloader.py
@@ -414,7 +414,7 @@ def __call__(self, params, input_context=None, batch_size=None):
     )
 
     batch_size = batch_size or params['batch_size']
-    seed = params['tf_random_seed'] if self._debug else None
+    seed = params.get('tf_random_seed', None)
     dataset = tf.data.Dataset.list_files(
         self._file_pattern, shuffle=self._is_training, seed=seed)
     if input_context:
diff --git a/efficientdet/tf2/train.py b/efficientdet/tf2/train.py
index 162f0ceed..8ca31ce04 100644
--- a/efficientdet/tf2/train.py
+++ b/efficientdet/tf2/train.py
@@ -101,7 +101,7 @@ def define_flags():
   flags.DEFINE_string('model_name', 'efficientdet-d0', 'Model name.')
   flags.DEFINE_bool('debug', False, 'Enable debug mode')
   flags.DEFINE_integer(
-      'tf_random_seed', 111111,
+      'tf_random_seed', None,
       'Fixed random seed for deterministic execution across runs for debugging.'
   )
   flags.DEFINE_bool('profile', False, 'Enable profile mode')
@@ -163,10 +163,12 @@ def main(_):
     for gpu in tf.config.list_physical_devices('GPU'):
       tf.config.experimental.set_memory_growth(gpu, True)
 
+  if FLAGS.tf_random_seed:
+    tf.random.set_seed(FLAGS.tf_random_seed)
+  
   if FLAGS.debug:
     tf.debugging.set_log_device_placement(True)
     os.environ['TF_DETERMINISTIC_OPS'] = '1'
-    tf.random.set_seed(FLAGS.tf_random_seed)
     logging.set_verbosity(logging.DEBUG)
 
   if FLAGS.strategy == 'tpu':