diff --git a/lib/AdminPages/Pages/FormEditor.php b/lib/AdminPages/Pages/FormEditor.php
index eb21128335..5bdfd86dfd 100644
--- a/lib/AdminPages/Pages/FormEditor.php
+++ b/lib/AdminPages/Pages/FormEditor.php
@@ -25,16 +25,21 @@ class FormEditor {
   /** @var FormRenderer */
   private $formRenderer;
 
+  /** @var Block\Date */
+  private $dateBlock;
+
   public function __construct(
     PageRenderer $pageRenderer,
     CustomFieldsRepository $customFieldsRepository,
     CustomFieldsResponseBuilder $customFieldsResponseBuilder,
-    FormRenderer $formRenderer
+    FormRenderer $formRenderer,
+    Block\Date $dateBlock
   ) {
     $this->pageRenderer = $pageRenderer;
     $this->customFieldsRepository = $customFieldsRepository;
     $this->customFieldsResponseBuilder = $customFieldsResponseBuilder;
     $this->formRenderer = $formRenderer;
+    $this->dateBlock = $dateBlock;
   }
 
   public function render() {
@@ -45,7 +50,7 @@ class FormEditor {
     }
     $form['styles'] = $this->formRenderer->getStyles($form);
     $customFields = $this->customFieldsRepository->findAll();
-    $dateTypes = Block\Date::getDateTypes();
+    $dateTypes = $this->dateBlock->getDateTypes();
     $data = [
       'form' => $form,
       'form_exports' => [
@@ -62,8 +67,8 @@ class FormEditor {
           'value' => $value,
         ];
       }, $dateTypes, array_keys($dateTypes)),
-      'date_formats' => Block\Date::getDateFormats(),
-      'month_names' => Block\Date::getMonthNames(),
+      'date_formats' => $this->dateBlock->getDateFormats(),
+      'month_names' => $this->dateBlock->getMonthNames(),
       'sub_menu' => 'mailpoet-forms',
       'custom_fields' => $this->customFieldsResponseBuilder->buildBatch($customFields),
     ];
diff --git a/lib/AdminPages/Pages/Subscribers.php b/lib/AdminPages/Pages/Subscribers.php
index 6eb0d362ac..2350280e35 100644
--- a/lib/AdminPages/Pages/Subscribers.php
+++ b/lib/AdminPages/Pages/Subscribers.php
@@ -27,11 +27,21 @@ class Subscribers {
   /** @var WPFunctions */
   private $wp;
 
-  public function __construct(PageRenderer $pageRenderer, PageLimit $listingPageLimit, SubscribersFeature $subscribersFeature, WPFunctions $wp) {
+  /** @var Block\Date */
+  private $dateBlock;
+
+  public function __construct(
+    PageRenderer $pageRenderer,
+    PageLimit $listingPageLimit,
+    SubscribersFeature $subscribersFeature,
+    WPFunctions $wp,
+    Block\Date $dateBlock
+  ) {
     $this->pageRenderer = $pageRenderer;
     $this->listingPageLimit = $listingPageLimit;
     $this->subscribersFeature = $subscribersFeature;
     $this->wp = $wp;
+    $this->dateBlock = $dateBlock;
   }
 
   public function render() {
@@ -59,8 +69,8 @@ class Subscribers {
       return $field;
     }, CustomField::findArray());
 
-    $data['date_formats'] = Block\Date::getDateFormats();
-    $data['month_names'] = Block\Date::getMonthNames();
+    $data['date_formats'] = $this->dateBlock->getDateFormats();
+    $data['month_names'] = $this->dateBlock->getMonthNames();
 
     $data['premium_plugin_active'] = License::getLicense();
     $data['mss_active'] = Bridge::isMPSendingServiceEnabled();
diff --git a/lib/AdminPages/Pages/SubscribersImport.php b/lib/AdminPages/Pages/SubscribersImport.php
index cc997bc6a8..f945876ad3 100644
--- a/lib/AdminPages/Pages/SubscribersImport.php
+++ b/lib/AdminPages/Pages/SubscribersImport.php
@@ -15,18 +15,22 @@ class SubscribersImport {
   /** @var Installation */
   private $installation;
 
-  public function __construct(PageRenderer $pageRenderer, Installation $installation) {
+  /** @var Block\Date */
+  private $dateBlock;
+
+  public function __construct(PageRenderer $pageRenderer, Installation $installation, Block\Date $dateBlock) {
     $this->pageRenderer = $pageRenderer;
     $this->installation = $installation;
+    $this->dateBlock = $dateBlock;
   }
 
   public function render() {
     $import = new ImportExportFactory(ImportExportFactory::IMPORT_ACTION);
     $data = $import->bootstrap();
     $data = array_merge($data, [
-      'date_types' => Block\Date::getDateTypes(),
-      'date_formats' => Block\Date::getDateFormats(),
-      'month_names' => Block\Date::getMonthNames(),
+      'date_types' => $this->dateBlock->getDateTypes(),
+      'date_formats' => $this->dateBlock->getDateFormats(),
+      'month_names' => $this->dateBlock->getMonthNames(),
       'sub_menu' => 'mailpoet-subscribers',
       'role_based_emails' => json_encode(ModelValidator::ROLE_EMAILS),
     ]);
diff --git a/lib/Models/CustomField.php b/lib/Models/CustomField.php
index 9d94c20ef1..210ae1c5d0 100644
--- a/lib/Models/CustomField.php
+++ b/lib/Models/CustomField.php
@@ -116,7 +116,7 @@ class CustomField extends Model {
       }
 
       if (!empty($value)) {
-        $value = Date::convertDateToDatetime($value, $dateFormat);
+        $value = (new Date())->convertDateToDatetime($value, $dateFormat);
       }
     }
 
diff --git a/lib/Subscribers/ImportExport/Import/Import.php b/lib/Subscribers/ImportExport/Import/Import.php
index b735eb04d8..02a0dcfc1f 100644
--- a/lib/Subscribers/ImportExport/Import/Import.php
+++ b/lib/Subscribers/ImportExport/Import/Import.php
@@ -162,7 +162,7 @@ class Import {
           $data = array_map(
             function($index, $date) use($validationRule, &$invalidRecords) {
               if (empty($date)) return $date;
-              $date = Date::convertDateToDatetime($date, $validationRule);
+              $date = (new Date())->convertDateToDatetime($date, $validationRule);
               if (!$date) {
                 $invalidRecords[] = $index;
               }
diff --git a/lib/Subscription/Pages.php b/lib/Subscription/Pages.php
index fe4c0ea4d2..8e941cb259 100644
--- a/lib/Subscription/Pages.php
+++ b/lib/Subscription/Pages.php
@@ -58,6 +58,9 @@ class Pages {
   /** @var FormRenderer */
   private $formRenderer;
 
+  /** @var FormBlockDate */
+  private $dateBlock;
+
   public function __construct(
     NewSubscriberNotificationMailer $newSubscriberNotificationSender,
     WPFunctions $wp,
@@ -68,7 +71,8 @@ class Pages {
     LinkTokens $linkTokens,
     SubscriptionUrlFactory $subscriptionUrlFactory,
     AssetsController $assetsController,
-    FormRenderer $formRenderer
+    FormRenderer $formRenderer,
+    FormBlockDate $dateBlock
   ) {
     $this->wp = $wp;
     $this->newSubscriberNotificationSender = $newSubscriberNotificationSender;
@@ -80,6 +84,7 @@ class Pages {
     $this->subscriptionUrlFactory = $subscriptionUrlFactory;
     $this->assetsController = $assetsController;
     $this->formRenderer = $formRenderer;
+    $this->dateBlock = $dateBlock;
   }
 
   public function init($action = false, $data = [], $initShortcodes = false, $initPageFilters = false) {
@@ -322,7 +327,7 @@ class Pages {
       $customField['params']['value'] = $subscriber->{$customField['id']};
 
       if ($customField['type'] === 'date') {
-        $dateFormats = FormBlockDate::getDateFormats();
+        $dateFormats = $this->dateBlock->getDateFormats();
         $customField['params']['date_format'] = array_shift(
           $dateFormats[$customField['params']['date_type']]
         );