diff --git a/HISTORY.rst b/HISTORY.rst
index 16a7cdd886..eda4947749 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -2,6 +2,7 @@
 ==================
 * Fix an issue with some browsers not firing the .load event on cached
   images. Ref: http://api.jquery.com/load-event/
+* Remove duplicate YAML loading of environment variables.
 
 3.1.6 (2018-10-09)
 ==================
diff --git a/mayan/apps/smart_settings/classes.py b/mayan/apps/smart_settings/classes.py
index 8448a3f611..a18445211e 100644
--- a/mayan/apps/smart_settings/classes.py
+++ b/mayan/apps/smart_settings/classes.py
@@ -151,7 +151,7 @@ class Setting(object):
         if environment_value:
             self.environment_variable = True
             try:
-                self.raw_value = yaml.safe_load(environment_value)
+                self.raw_value = environment_value
             except yaml.YAMLError as exception:
                 raise type(exception)(
                     'Error interpreting environment variable: {} with '