diff --git a/.flowconfig b/.flowconfig
index 45bff64eb6..47ae59598a 100644
--- a/.flowconfig
+++ b/.flowconfig
@@ -17,7 +17,6 @@ suppress_comment=.*\\$FlowIssue
 esproposal.class_instance_fields=enable
 module.system.node.resolve_dirname=node_modules
 module.system.node.resolve_dirname=.
-module.file_ext=.web.js
 module.file_ext=.js
 module.file_ext=.jsx
 module.file_ext=.json
diff --git a/shared/clients/draft-js/links-decorator/index.web.js b/shared/clients/draft-js/links-decorator/index.js
similarity index 100%
rename from shared/clients/draft-js/links-decorator/index.web.js
rename to shared/clients/draft-js/links-decorator/index.js
diff --git a/shared/clients/draft-js/mentions-decorator/index.web.js b/shared/clients/draft-js/mentions-decorator/index.js
similarity index 100%
rename from shared/clients/draft-js/mentions-decorator/index.web.js
rename to shared/clients/draft-js/mentions-decorator/index.js
diff --git a/shared/clients/draft-js/mentions-decorator/test/mentions-decorator.test.js b/shared/clients/draft-js/mentions-decorator/test/mentions-decorator.test.js
index 9108f11f8c..fd8592bd35 100644
--- a/shared/clients/draft-js/mentions-decorator/test/mentions-decorator.test.js
+++ b/shared/clients/draft-js/mentions-decorator/test/mentions-decorator.test.js
@@ -1,6 +1,6 @@
 // @flow
 import { genKey, ContentBlock } from 'draft-js';
-import mentionsDecorator from '../index.web.js';
+import mentionsDecorator from '../index';
 import type { ContentBlock as ContentBlockType } from 'draft-js/lib/ContentBlock';
 
 type Mention = string;
diff --git a/shared/clients/draft-js/message/renderer.web.js b/shared/clients/draft-js/message/renderer.js
similarity index 91%
rename from shared/clients/draft-js/message/renderer.web.js
rename to shared/clients/draft-js/message/renderer.js
index 41a1064fad..7e823360ba 100644
--- a/shared/clients/draft-js/message/renderer.web.js
+++ b/shared/clients/draft-js/message/renderer.js
@@ -1,7 +1,7 @@
 // @flow
 import React from 'react';
-import mentionsDecorator from '../mentions-decorator/index.web';
-import linksDecorator from '../links-decorator/index.web';
+import mentionsDecorator from '../mentions-decorator/index';
+import linksDecorator from '../links-decorator/index';
 import { Line, Paragraph, BlockQuote } from 'src/components/message/style';
 import type { Node } from 'react';
 import type { KeyObj, KeysObj, DataObj } from './types';
diff --git a/shared/clients/draft-js/message/test/renderer.test.js b/shared/clients/draft-js/message/test/renderer.test.js
index 53d618b350..844e90af41 100644
--- a/shared/clients/draft-js/message/test/renderer.test.js
+++ b/shared/clients/draft-js/message/test/renderer.test.js
@@ -1,7 +1,7 @@
 // @flow
-import { messageRenderer } from '../renderer.web';
-import mentionsDecorator from '../../mentions-decorator/index.web';
-import linksDecorator from '../../links-decorator/index.web';
+import { messageRenderer } from '../renderer';
+import mentionsDecorator from '../../mentions-decorator/index';
+import linksDecorator from '../../links-decorator/index';
 
 describe('messageRenderer', () => {
   it('should render certain blocks', () => {
diff --git a/src/components/message/view.js b/src/components/message/view.js
index 5e0fe53749..672a191e7f 100644
--- a/src/components/message/view.js
+++ b/src/components/message/view.js
@@ -10,7 +10,7 @@ import {
   QuoteWrapperGradient,
   QuotedParagraph,
 } from './style';
-import { messageRenderer } from 'shared/clients/draft-js/message/renderer.web';
+import { messageRenderer } from 'shared/clients/draft-js/message/renderer';
 import { draftOnlyContainsEmoji } from 'shared/only-contains-emoji';
 import { Byline, Name, Username } from './style';
 import { isShort } from 'shared/clients/draft-js/utils/isShort';