diff --git a/airtime_mvc/application/configs/config-check.php b/airtime_mvc/application/configs/config-check.php
index 5d8e7c3b2..4c9857b62 100644
--- a/airtime_mvc/application/configs/config-check.php
+++ b/airtime_mvc/application/configs/config-check.php
@@ -16,7 +16,8 @@ $rabbitmq           = $externalServices["rabbitmq"];
 
 $pypo               = $externalServices["pypo"];
 $liquidsoap         = $externalServices["liquidsoap"];
-$analyzer       = $externalServices["analyzer"];
+$analyzer           = $externalServices["analyzer"];
+$celery             = $externalServices['celery'];
 
 $r1 = array_reduce($phpDependencies, "booleanReduce", true);
 $r2 = array_reduce($externalServices, "booleanReduce", true);
@@ -222,6 +223,26 @@ $result = $r1 && $r2;
                         ?>
                     </td>
                 </tr>
+                <tr class="<?=$celery ? 'success' : 'danger';?>">
+                    <td class="component">
+                        Celery
+                    </td>
+                    <td class="description">
+                        Airtime Celery Task service
+                    </td>
+                    <td class="solution <?php if ($celery) {echo 'check';?>">
+                        <?php
+                        } else {
+                            ?>">
+                            Check that the airtime-celery service is installed correctly in <code>/etc/init.d</code>,
+                            and ensure that it's running with
+                            <br/><code>initctl list | grep airtime-celery</code><br/>
+                            If not, try running <code>sudo service airtime-celery restart</code>
+                        <?php
+                        }
+                        ?>
+                    </td>
+                </tr>
                 </tbody>
             </table>
         </div>
diff --git a/airtime_mvc/application/views/scripts/systemstatus/index.phtml b/airtime_mvc/application/views/scripts/systemstatus/index.phtml
index fb16caf29..b675a0afc 100644
--- a/airtime_mvc/application/views/scripts/systemstatus/index.phtml
+++ b/airtime_mvc/application/views/scripts/systemstatus/index.phtml
@@ -13,6 +13,7 @@
     $pypo =          $externalServices["pypo"];
     $liquidsoap =    $externalServices["liquidsoap"];
     $analyzer =      $externalServices["analyzer"];
+    $celery =        $externalServices['celery'];
 
     $r1 = array_reduce($phpDependencies, "booleanReduce", true);
     $r2 = array_reduce($externalServices, "booleanReduce", true);
@@ -149,6 +150,26 @@
                 ?>
             </td>
         </tr>
+        <tr>
+            <td class="component">
+                Celery
+            </td>
+            <td class="description">
+                LibreTime Celery Task service
+            </td>
+            <td class="solution <?php if ($celery) {echo 'check';?>" >
+                <?php
+                } else {
+                    ?>">
+                    Check that the airtime-celery service is installed correctly in <code>/etc/init</code>, 
+                    and ensure that it's running with
+                    <br/><code>initctl list | grep airtime-celery</code><br/>
+                    If not, try <br/><code>sudo service airtime-celery restart</code>
+                <?php
+                }
+                ?>
+            </td>
+        </tr>
     </tbody>
     <tr id="partitions" class="even">
         <th colspan="5"><?php echo _("Disk Space") ?></th>
diff --git a/airtime_mvc/build/airtime-setup/load.php b/airtime_mvc/build/airtime-setup/load.php
index 3e81abec7..eaf3eab9e 100644
--- a/airtime_mvc/build/airtime-setup/load.php
+++ b/airtime_mvc/build/airtime-setup/load.php
@@ -54,7 +54,8 @@ function checkExternalServices() {
             "analyzer" => checkAnalyzerService(),
             "pypo" => checkPlayoutService(),
             "liquidsoap" => checkLiquidsoapService(),
-            "rabbitmq" => checkRMQConnection()
+            "rabbitmq" => checkRMQConnection(),
+            "celery" => checkCeleryService(),
     );
 }
 
@@ -144,3 +145,16 @@ function checkLiquidsoapService() {
     }
     return $status == 0;
 }
+
+/**
+ * Check if airtime-celery is currently running
+ * 
+ * @return boolean true if airtime-celery is running
+ */
+function checkCeleryService() {
+    exec("pgrep -f -u celery airtime-celery", $out, $status);
+    if (array_key_exists(0, $out) && $status == 0) {
+        return posix_kill(rtrim($out[0]), 0);
+    }
+    return $status == 0;
+}