diff --git a/app/assets/javascripts/admin/all.js b/app/assets/javascripts/admin/all.js
index c43f365cb6..47d5487631 100644
--- a/app/assets/javascripts/admin/all.js
+++ b/app/assets/javascripts/admin/all.js
@@ -71,7 +71,7 @@
 //= require textAngular.min.js
 //= require i18n/translations
 //= require darkswarm/i18n.translate.js
-//= require moment
+//= require moment/min/moment.min.js
 //= require moment/de.js
 //= require moment/en-gb.js
 //= require moment/es.js
diff --git a/app/assets/javascripts/darkswarm/all.js.coffee b/app/assets/javascripts/darkswarm/all.js.coffee
index 51209fadd6..41f4c5147c 100644
--- a/app/assets/javascripts/darkswarm/all.js.coffee
+++ b/app/assets/javascripts/darkswarm/all.js.coffee
@@ -28,7 +28,7 @@
 #= require angular-backstretch.js
 #= require angular-flash.min.js
 #
-#= require moment
+#= require moment/min/moment.min.js
 #= require moment/de.js
 #= require moment/en-gb.js
 #= require moment/es.js
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
new file mode 100644
index 0000000000..2e9af484ab
--- /dev/null
+++ b/config/initializers/assets.rb
@@ -0,0 +1 @@
+Rails.application.config.assets.paths << Rails.root.join('node_modules')
diff --git a/spec/javascripts/application_spec.js b/spec/javascripts/application_spec.js
index 47368298f8..24c76ce9d7 100644
--- a/spec/javascripts/application_spec.js
+++ b/spec/javascripts/application_spec.js
@@ -12,7 +12,7 @@
 //= require textAngular-rangy.min.js
 //= require textAngular-sanitize.min.js
 //= require textAngular.min.js
-//= require moment
+//= require moment/min/moment.min.js
 //= require i18n
 
 angular.module('templates', [])