diff --git a/client/startup/startup.js b/client/startup/startup.js
index de6c464f40f..e2356a29bc0 100644
--- a/client/startup/startup.js
+++ b/client/startup/startup.js
@@ -1,6 +1,14 @@
 /* globals UserPresence, fireGlobalEvent, isRtl */
 
 import moment from 'moment';
+import toastr from 'toastr';
+
+if (window.DISABLE_ANIMATION) {
+	toastr.options.timeOut = 1;
+	toastr.options.showDuration = 0;
+	toastr.options.hideDuration = 0;
+	toastr.options.extendedTimeOut = 0;
+}
 
 Meteor.startup(function() {
 	TimeSync.loggingEnabled = false;
diff --git a/packages/rocketchat-ui-master/server/inject.js b/packages/rocketchat-ui-master/server/inject.js
index d6c74e2e4cb..268e268abcb 100644
--- a/packages/rocketchat-ui-master/server/inject.js
+++ b/packages/rocketchat-ui-master/server/inject.js
@@ -60,6 +60,9 @@ if (process.env.DISABLE_ANIMATION || process.env.TEST_MODE === 'true') {
 			transition: none !important;
 		}
 	</style>
+	<script>
+		window.DISABLE_ANIMATION = true;
+	</script>
 	`);
 }