diff --git a/b2share/modules/records/serializers/schemas/json.py b/b2share/modules/records/serializers/schemas/json.py
index 08c78f938f..adb98ad3ca 100644
--- a/b2share/modules/records/serializers/schemas/json.py
+++ b/b2share/modules/records/serializers/schemas/json.py
@@ -73,7 +73,7 @@ def filter_internal(self, data):
                 g.record_hit['_source'])
 
         if '_deposit' in data['metadata']:
-            if hasattr(g, 'record') and is_deposit(record.model):# and current_app.config['AUTOMATICALLY_ASSIGN_DOI']:
+            if hasattr(g, 'record') and is_deposit(record.model) and current_app.config['AUTOMATICALLY_ASSIGN_DOI']:
                 # add future DOI string
                 data['metadata'].update({'future_doi': generate_doi(data['metadata']['_deposit']['id']) })