diff --git a/CHANGELOG.md b/CHANGELOG.md
index 032494b16..e2b2f3681 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 8.14.1 (2022-08-14)
+
+### Bugfixes
+
+ - Fix Conditional Function 'timeout' undefined error ([#1220](https://github.com/kizniche/Mycodo/issues/1220))
+
+
 ## 8.14.0 (2022-08-13)
 
 ### Bugfixes
diff --git a/README.rst b/README.rst
index ceb02004f..60077cb4b 100644
--- a/README.rst
+++ b/README.rst
@@ -3,7 +3,7 @@ Mycodo
 
 Environmental Regulation System
 
-Latest version: 8.14.0
+Latest version: 8.14.1
 
 Mycodo is open source software for the Raspberry Pi that couples inputs and outputs in interesting ways to sense and manipulate the environment.
 
diff --git a/mycodo/config.py b/mycodo/config.py
index 5e7ac6431..805f333d9 100644
--- a/mycodo/config.py
+++ b/mycodo/config.py
@@ -13,7 +13,7 @@
 sys.path.append(os.path.abspath(os.path.dirname(__file__)))
 from config_translations import TRANSLATIONS as T
 
-MYCODO_VERSION = '8.14.0'
+MYCODO_VERSION = '8.14.1'
 ALEMBIC_VERSION = '07c7c8ebc195'
 
 # FORCE UPGRADE MASTER
diff --git a/mycodo/utils/conditional.py b/mycodo/utils/conditional.py
index 901363adb..1472da3ab 100644
--- a/mycodo/utils/conditional.py
+++ b/mycodo/utils/conditional.py
@@ -56,7 +56,7 @@ def save_conditional_code(
 from mycodo.mycodo_client import DaemonControl
 control = DaemonControl(pyro_timeout={timeout})
 
-"""
+""".format(timeout=timeout)
 
         if cond_import:
             class_code += cond_import
@@ -72,7 +72,7 @@ def __init__(self, logger, function_id, message):
         self.variables = {{}}
         self.message = message
         self.running = True
-"""
+""".format(timeout=timeout)
 
         if cond_initialize:
             class_code += textwrap.indent(cond_initialize, ' ' * 8)
@@ -80,7 +80,7 @@ def __init__(self, logger, function_id, message):
         class_code += """
 
     def conditional_code_run(self):
-""".format(timeout=timeout)
+"""
 
         if cond_statement:
             class_code += textwrap.indent(cond_statement, ' ' * 8)