diff --git a/admin/manage_statuses.php b/admin/manage_statuses.php
index 95627695..43a1588c 100644
--- a/admin/manage_statuses.php
+++ b/admin/manage_statuses.php
@@ -21,7 +21,8 @@ define('WYSIWYG',1);
 
 // Are we performing an action?
 if (isset($_REQUEST['a'])) {
-    if ($_REQUEST['a'] == 'create') { createStatus(); }
+    if ( defined('HESK_DEMO') ) { hesk_process_messages($hesklang['cannot_edit_status_demo'], 'manage_statuses.php'); }
+    elseif ($_REQUEST['a'] == 'create') { createStatus(); }
     elseif ($_REQUEST['a'] == 'update') { updateStatus(); }
     elseif ($_REQUEST['a'] == 'delete') { deleteStatus(); }
     elseif ($_REQUEST['a'] == 'sort') { moveStatus(); }
diff --git a/language/en/text.php b/language/en/text.php
index 5a5b4fe1..017d3845 100644
--- a/language/en/text.php
+++ b/language/en/text.php
@@ -60,6 +60,7 @@ $hesklang['kb_attach_dir'] = 'Knowledgebase attachments folder';
 $hesklang['kb_attach_dir_help'] = 'Name of the folder, where knowledgebase attachments will be stored.<br><br>The folder needs to exist within the main HESK folder and be writable by PHP. On most systems names are CaSe SeNSiTiVe.
     <br><br>Allowed chars (other will be removed): a-z A-Z 0-9 _ -';
 $hesklang['ticket_attach_dir'] = 'Ticket attachments folder';
+$hesklang['cannot_edit_status_demo'] = 'You cannot edit statuses while in demo mode!';
 
 // ADDED OR MODIFIED IN Mods for HESK 2.3.0
 $hesklang['sm_icon'] = 'Icon';