diff --git a/airtime_mvc/application/controllers/PluploadController.php b/airtime_mvc/application/controllers/PluploadController.php
index c3fa239e9..7c808140c 100644
--- a/airtime_mvc/application/controllers/PluploadController.php
+++ b/airtime_mvc/application/controllers/PluploadController.php
@@ -27,10 +27,9 @@ class PluploadController extends Zend_Controller_Action
         $this->view->headLink()->appendStylesheet($baseUrl.'css/addmedia.css?'.$CC_CONFIG['airtime_version']);
 
         $this->view->quotaLimitReached = false;
-        // temporarily disabling disk quota until all file size values have been set
-        /*if (Application_Model_Systemstatus::isDiskOverQuota()) {
+        if (Application_Model_Systemstatus::isDiskOverQuota()) {
             $this->view->quotaLimitReached = true;
-        }*/
+        }
 
         //Because uploads are done via AJAX (and we're not using Zend form for those), we manually add the CSRF
         //token in here.
diff --git a/airtime_mvc/application/models/airtime/CcFiles.php b/airtime_mvc/application/models/airtime/CcFiles.php
index 71e5f2ca6..029d21a15 100644
--- a/airtime_mvc/application/models/airtime/CcFiles.php
+++ b/airtime_mvc/application/models/airtime/CcFiles.php
@@ -78,11 +78,9 @@ class CcFiles extends BaseCcFiles {
      */
     public static function createFromUpload($fileArray)
     {
-        /*temporarily disabling disk quota until all file sizes have ben set in the database.
         if (Application_Model_Systemstatus::isDiskOverQuota()) {
             throw new OverDiskQuotaException();
         }
-        */
 
         /* If full_path is set, the post request came from ftp.
          * Users are allowed to upload folders via ftp. If this is the case