diff --git a/addon/date.js b/addon/date.js
index f14bb3c..2583ae7 100755
--- a/addon/date.js
+++ b/addon/date.js
@@ -3,7 +3,7 @@ import { set, getProperties, getWithDefault } from '@ember/object';
 import validationError from 'ember-validators/utils/validation-error';
 import requireModule from 'ember-require-module';
 
-const moment = requireModule('moment');
+const moment = requireModule('moment') || requireModule('ember-cli-moment-shim');
 
 /**
  * @class Date