diff --git a/dev-server/src/index.js b/dev-server/src/index.js
index 169a2501..cab67b7e 100644
--- a/dev-server/src/index.js
+++ b/dev-server/src/index.js
@@ -181,6 +181,7 @@ function getExampleJson1() {
     return {
         string: 'this is a test string',
         integer: 42,
+        bigint: BigInt('123456789012345678901234567890'),
         empty_array: [],
         empty_object: {},
         array: [1, 2, 3, 'test'],
diff --git a/package-lock.json b/package-lock.json
index 9589552f..5c224251 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
     "name": "react-json-view",
-    "version": "1.21.1",
+    "version": "1.21.3",
     "lockfileVersion": 1,
     "requires": true,
     "dependencies": {
@@ -4073,12 +4073,27 @@
             "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
             "dev": true
         },
+        "bignumber.js": {
+            "version": "9.0.1",
+            "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.1.tgz",
+            "integrity": "sha512-IdZR9mh6ahOBv/hYGiXyVuyCetmGJhtYkqLBpTStdhEGjegpPlUawydyaF3pbIOFynJTpllEs+NP+CS9jKFLjA=="
+        },
         "binary-extensions": {
             "version": "2.2.0",
             "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
             "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
             "dev": true
         },
+        "bindings": {
+            "version": "1.5.0",
+            "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+            "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "file-uri-to-path": "1.0.0"
+            }
+        },
         "block-stream": {
             "version": "0.0.9",
             "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
@@ -7839,6 +7854,13 @@
                 }
             }
         },
+        "file-uri-to-path": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+            "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+            "dev": true,
+            "optional": true
+        },
         "filesize": {
             "version": "6.1.0",
             "resolved": "https://registry.npmjs.org/filesize/-/filesize-6.1.0.tgz",
@@ -12141,6 +12163,14 @@
             "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
             "dev": true
         },
+        "json-bigint": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz",
+            "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==",
+            "requires": {
+                "bignumber.js": "^9.0.0"
+            }
+        },
         "json-parse-better-errors": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
@@ -16438,6 +16468,7 @@
                             "dev": true,
                             "optional": true,
                             "requires": {
+                                "bindings": "^1.5.0",
                                 "nan": "^2.12.1"
                             }
                         }
@@ -20337,6 +20368,7 @@
                     "dev": true,
                     "optional": true,
                     "requires": {
+                        "bindings": "^1.5.0",
                         "nan": "^2.12.1"
                     }
                 },
@@ -21140,6 +21172,7 @@
                     "dev": true,
                     "optional": true,
                     "requires": {
+                        "bindings": "^1.5.0",
                         "nan": "^2.12.1"
                     }
                 },
diff --git a/package.json b/package.json
index 36d66aad..ba8cc61f 100644
--- a/package.json
+++ b/package.json
@@ -5,6 +5,7 @@
     "main": "dist/main.js",
     "dependencies": {
         "flux": "^4.0.1",
+        "json-bigint": "^1.0.0",
         "react-base16-styling": "^0.6.0",
         "react-lifecycles-compat": "^3.0.4",
         "react-textarea-autosize": "^8.3.2"
diff --git a/src/js/components/CopyToClipboard.js b/src/js/components/CopyToClipboard.js
index 62ea78df..9b8faeef 100644
--- a/src/js/components/CopyToClipboard.js
+++ b/src/js/components/CopyToClipboard.js
@@ -1,4 +1,5 @@
 import React from 'react';
+import JSONBig from 'json-bigint';
 
 import { toType } from './../helpers/util';
 
@@ -29,7 +30,7 @@ export default class extends React.PureComponent {
         const container = document.createElement('textarea');
         const { clickCallback, src, namespace } = this.props;
 
-        container.innerHTML = JSON.stringify(
+        container.innerHTML = JSONBig.stringify(
             this.clipboardValue(src),
             null,
             '  '
diff --git a/src/js/components/DataTypes/BigInt.js b/src/js/components/DataTypes/BigInt.js
new file mode 100644
index 00000000..d0df6d68
--- /dev/null
+++ b/src/js/components/DataTypes/BigInt.js
@@ -0,0 +1,18 @@
+import React from 'react';
+import DataTypeLabel from './DataTypeLabel';
+
+//theme
+import Theme from './../../themes/getStyle';
+
+export default class extends React.PureComponent {
+    render() {
+        const type_name = 'bigint';
+        const { props } = this;
+        return (
+            <div {...Theme(props.theme, 'integer')}>
+                <DataTypeLabel type_name={type_name} {...props} />
+                {this.props.value.toString()}
+            </div>
+        );
+    }
+}
diff --git a/src/js/components/DataTypes/DataTypes.js b/src/js/components/DataTypes/DataTypes.js
index de5c5016..b988d89b 100644
--- a/src/js/components/DataTypes/DataTypes.js
+++ b/src/js/components/DataTypes/DataTypes.js
@@ -5,6 +5,7 @@ export { default as JsonFunction } from './Function';
 export { default as JsonNan } from './Nan';
 export { default as JsonNull } from './Null';
 export { default as JsonInteger } from './Integer';
+export { default as JsonBigInt } from './BigInt';
 export { default as JsonObject } from './Object';
 export { default as JsonRegexp } from './Regexp';
 export { default as JsonString } from './String';
diff --git a/src/js/components/VariableEditor.js b/src/js/components/VariableEditor.js
index a78aab4e..c2d27c94 100644
--- a/src/js/components/VariableEditor.js
+++ b/src/js/components/VariableEditor.js
@@ -14,6 +14,7 @@ import {
     JsonFloat,
     JsonFunction,
     JsonInteger,
+    JsonBigInt,
     JsonNan,
     JsonNull,
     JsonRegexp,
@@ -226,6 +227,8 @@ class VariableEditor extends React.PureComponent {
                 return <JsonString value={variable.value} {...props} />;
             case 'integer':
                 return <JsonInteger value={variable.value} {...props} />;
+            case 'bigint':
+                return <JsonBigInt value={variable.value} {...props} />;
             case 'float':
                 return <JsonFloat value={variable.value} {...props} />;
             case 'boolean':
@@ -436,6 +439,8 @@ class VariableEditor extends React.PureComponent {
                     return <JsonString value={value} {...props} />;
                 case 'integer':
                     return <JsonInteger value={value} {...props} />;
+                case 'bigint':
+                    return <JsonBigInt value={value} {...props} />;
                 case 'float':
                     return <JsonFloat value={value} {...props} />;
                 case 'boolean':
diff --git a/src/js/helpers/parseInput.js b/src/js/helpers/parseInput.js
index 8eeb36ca..96600ebe 100644
--- a/src/js/helpers/parseInput.js
+++ b/src/js/helpers/parseInput.js
@@ -1,3 +1,5 @@
+import JSONBig from 'json-bigint';
+
 export default function parseInput(input) {
     //following code is to make a best guess at
     //the type for a variable being submitted.
@@ -5,13 +7,13 @@ export default function parseInput(input) {
     //we are working with a serialized data representation
     input = input.trim();
     try {
-        input = JSON.stringify(JSON.parse(input));
+        input = JSONBig.stringify(JSONBig.parse(input));
         if (input[0] === '[') {
             //array
-            return formatResponse('array', JSON.parse(input));
+            return formatResponse('array', JSONBig({ useNativeBigInt: true }).parse(input));
         } else if (input[0] === '{') {
             //object
-            return formatResponse('object', JSON.parse(input));
+            return formatResponse('object', JSONBig({ useNativeBigInt: true }).parse(input));
         } else if (
             input.match(/\-?\d+\.\d+/) &&
             input.match(/\-?\d+\.\d+/)[0] === input
@@ -28,6 +30,10 @@ export default function parseInput(input) {
             input.match(/\-?\d+/) &&
             input.match(/\-?\d+/)[0] === input
         ) {
+            //bigint
+            if (Number(input) > Number.MAX_SAFE_INTEGER) {
+                return formatResponse('bigint', BigInt(input));
+            }
             //integer
             return formatResponse('integer', parseInt(input));
         } else if (
diff --git a/src/js/helpers/stringifyVariable.js b/src/js/helpers/stringifyVariable.js
index adfa0355..e9811af7 100644
--- a/src/js/helpers/stringifyVariable.js
+++ b/src/js/helpers/stringifyVariable.js
@@ -1,4 +1,5 @@
 import { toType } from './util';
+import JSONBig from 'json-bigint';
 
 export default value => {
     const type = toType(value);
@@ -25,7 +26,7 @@ export default value => {
             break;
         default: {
             try {
-                string_value = JSON.stringify(value, null, '  ');
+                string_value = JSONBig.stringify(value, null, '  ');
             } catch (e) {
                 string_value = '';
             }