diff --git a/src/paperless/db.py b/src/paperless/db.py
index 49e4fea4b..07cef0024 100644
--- a/src/paperless/db.py
+++ b/src/paperless/db.py
@@ -12,11 +12,15 @@ class GnuPG(object):
 
     @classmethod
     def decrypted(cls, file_handle):
+        if(not settings.ENABLE_ENCRYPTION):
+            return file_handle.read()
         return cls.gpg.decrypt_file(
             file_handle, passphrase=settings.PASSPHRASE).data
 
     @classmethod
     def encrypted(cls, file_handle):
+        if(not settings.ENABLE_ENCRYPTION):
+            return file_handle.read()
         return cls.gpg.encrypt_file(
             file_handle,
             recipients=None,