diff --git a/frappe/model/document.py b/frappe/model/document.py
index 74f6ab0680..3e8db22802 100644
--- a/frappe/model/document.py
+++ b/frappe/model/document.py
@@ -4,7 +4,6 @@
 from __future__ import unicode_literals, print_function
 import frappe
 import time
-import redis
 from frappe import _, msgprint
 from frappe.utils import flt, cstr, now, get_datetime_str, file_lock
 from frappe.utils.background_jobs import enqueue
diff --git a/frappe/modules/import_file.py b/frappe/modules/import_file.py
index 5f7c04c7f5..57c671b407 100644
--- a/frappe/modules/import_file.py
+++ b/frappe/modules/import_file.py
@@ -34,7 +34,6 @@ def get_file_path(module, dt, dn):
 
 def import_file_by_path(path, force=False, data_import=False, pre_process=None, ignore_version=None,
 		reset_permissions=False):
-	frappe.flags.in_import = True
 	try:
 		docs = read_doc_from_file(path)
 	except IOError:
@@ -54,8 +53,10 @@ def import_file_by_path(path, force=False, data_import=False, pre_process=None,
 
 			original_modified = doc.get("modified")
 
+			frappe.flags.in_import = True
 			import_doc(doc, force=force, data_import=data_import, pre_process=pre_process,
 				ignore_version=ignore_version, reset_permissions=reset_permissions)
+			frappe.flags.in_import = False
 
 			if original_modified:
 				# since there is a new timestamp on the file, update timestamp in
@@ -67,7 +68,6 @@ def import_file_by_path(path, force=False, data_import=False, pre_process=None,
 						(doc['doctype'], '%s', '%s'),
 						(original_modified, doc['name']))
 
-	frappe.flags.in_import = False
 	return True
 
 def read_doc_from_file(path):