diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index e3bdb8e20f..bea5a134e0 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -13,13 +13,13 @@ Npm.depends({
   send: "1.1.0",
   "stream-to-string": "1.2.1",
   qs: "6.13.0",
-  useragent: "2.3.0",
+  "useragent-ng": "2.4.3",
   "@types/connect": "3.4.38",
 });
 
 Npm.strip({
   multiparty: ["test/"],
-  useragent: ["test/"],
+  "useragent-ng": ["test/"],
 });
 
 // whitelist plugin is now included in the core
diff --git a/packages/webapp/webapp_server.js b/packages/webapp/webapp_server.js
index 6506372d9d..03b356a0ea 100644
--- a/packages/webapp/webapp_server.js
+++ b/packages/webapp/webapp_server.js
@@ -10,7 +10,7 @@ import compress from 'compression';
 import cookieParser from 'cookie-parser';
 import qs from 'qs';
 import parseRequest from 'parseurl';
-import { lookup as lookupUserAgent } from 'useragent';
+import { lookup as lookupUserAgent } from 'useragent-ng';
 import { isModern } from 'meteor/modern-browsers';
 import send from 'send';
 import {
@@ -123,7 +123,7 @@ var camelCase = function(name) {
 };
 
 var identifyBrowser = function(userAgentString) {
-  var userAgent = lookupUserAgent(userAgentString);
+  var userAgent = lookupUserAgent(userAgentString.substring(0, 150));
   return {
     name: camelCase(userAgent.family),
     major: +userAgent.major,