diff --git a/packages/teleport-plugin-html-base-component/src/node-handlers.ts b/packages/teleport-plugin-html-base-component/src/node-handlers.ts
index dd7fc0e72..e8e58c2fe 100644
--- a/packages/teleport-plugin-html-base-component/src/node-handlers.ts
+++ b/packages/teleport-plugin-html-base-component/src/node-handlers.ts
@@ -501,6 +501,13 @@ const generateDynamicNode: NodeToHTML<UIDLDynamicReference, Promise<HastNode | H
   propDefinitions,
   stateDefinitions
 ): Promise<HastNode | HastText> => {
+  if (node.content.referenceType === 'locale') {
+    const localeTag = HASTBuilders.createHTMLNode('span')
+    const commentNode = HASTBuilders.createComment(`Content for locale ${node.content.id}`)
+    HASTUtils.addChildNode(localeTag, commentNode)
+    return localeTag
+  }
+
   const usedReferenceValue = getValueFromReference(
     node.content.id,
     node.content.referenceType === 'prop' ? propDefinitions : stateDefinitions
diff --git a/packages/teleport-project-generator-next/__tests__/end2end/__snapshots__/index.ts.snap b/packages/teleport-project-generator-next/__tests__/end2end/__snapshots__/index.ts.snap
index b11d99f38..35052416d 100644
--- a/packages/teleport-project-generator-next/__tests__/end2end/__snapshots__/index.ts.snap
+++ b/packages/teleport-project-generator-next/__tests__/end2end/__snapshots__/index.ts.snap
@@ -7,11 +7,14 @@ Object {
   "content": "import React, { useEffect } from 'react'
 import Head from 'next/head'
 
+import { useTranslations } from 'next-intl'
+
 import Header from '../components/header'
 import Hero from '../components/hero'
 import Footer from '../components/footer'
 
 const Home = (props) => {
+  const translate = useTranslations()
   useEffect(() => import('@lottiefiles/lottie-player'), [])
   return (
     <>
@@ -36,6 +39,18 @@ const Home = (props) => {
             </div>
           }
         ></Hero>
+        <span
+          dangerouslySetInnerHTML={{
+            __html: translate.raw('text_S5OU83'),
+          }}
+        ></span>
+        <h1>
+          <span
+            dangerouslySetInnerHTML={{
+              __html: translate.raw('text_S5OU83'),
+            }}
+          ></span>
+        </h1>
         <Footer></Footer>
       </div>
       <style jsx>
@@ -75,6 +90,16 @@ const Home = (props) => {
 }
 
 export default Home
+
+export async function getStaticProps(context) {
+  const messages = (await import('../locales/' + context.locale + '.json'))
+    .default
+  return {
+    props: {
+      messages,
+    },
+  }
+}
 ",
   "fileType": "js",
   "name": "index",
diff --git a/packages/teleport-project-generator-next/__tests__/end2end/index.ts b/packages/teleport-project-generator-next/__tests__/end2end/index.ts
index 8a0e97fd7..37b246eb6 100644
--- a/packages/teleport-project-generator-next/__tests__/end2end/index.ts
+++ b/packages/teleport-project-generator-next/__tests__/end2end/index.ts
@@ -43,7 +43,7 @@ describe('React Next Project Generator', () => {
     expect(outputFolder.files[0].name).toBe('package')
     expect(appFile).toBeDefined()
     expect(appFile?.content).not.toContain(`import "antd/dist/antd.css`)
-    expect(appFile?.content).toContain(`import "./style.css"`)
+    expect(appFile?.content).toContain(`import './style.css'`)
   })
 
   it('runs without crashing and adding external dependencies', async () => {
@@ -85,7 +85,7 @@ describe('React Next Project Generator', () => {
     expect(styleSheet).toBeDefined()
     expect(styleSheet?.content).toContain(`--greys-500: #595959`)
     expect(appFile).toBeDefined()
-    expect(appFile?.content).toContain(`import "./style.css"`)
+    expect(appFile?.content).toContain(`import './style.css'`)
   })
 
   it('creates a default route if a page is marked as fallback', async () => {
diff --git a/packages/teleport-project-generator-next/package.json b/packages/teleport-project-generator-next/package.json
index 5645d26cb..995380106 100644
--- a/packages/teleport-project-generator-next/package.json
+++ b/packages/teleport-project-generator-next/package.json
@@ -24,6 +24,7 @@
     "build": "tsc -p tsconfig.json && tsc -p tsconfig.json --module commonjs --outDir dist/cjs"
   },
   "dependencies": {
+    "@babel/generator": "^7.5.5",
     "@babel/types": "^7.5.5",
     "@teleporthq/teleport-component-generator": "^0.36.5",
     "@teleporthq/teleport-component-generator-react": "^0.36.5",
@@ -38,7 +39,8 @@
     "@teleporthq/teleport-postprocessor-prettier-js": "^0.36.0",
     "@teleporthq/teleport-project-generator": "^0.36.5",
     "@teleporthq/teleport-shared": "^0.36.0",
-    "@teleporthq/teleport-types": "^0.36.0"
+    "@teleporthq/teleport-types": "^0.36.0",
+    "@teleporthq/teleport-uidl-resolver": "^0.36.1"
   },
   "gitHead": "b185c3fdb7dc94ff8c7eed63f7edba055fffa8d0"
 }
diff --git a/packages/teleport-types/package.json b/packages/teleport-types/package.json
index a67546204..1d64f5386 100644
--- a/packages/teleport-types/package.json
+++ b/packages/teleport-types/package.json
@@ -23,5 +23,8 @@
     "clean": "rimraf dist",
     "build": "tsc -p tsconfig.json && tsc -p tsconfig.json --module commonjs --outDir dist/cjs"
   },
+  "devDependencies": {
+    "@babel/types": "^7.5.5"
+  },
   "gitHead": "b185c3fdb7dc94ff8c7eed63f7edba055fffa8d0"
 }