diff --git a/src/index.js b/src/index.js
index 648b5ee..9181e1c 100644
--- a/src/index.js
+++ b/src/index.js
@@ -34,9 +34,7 @@ export default function nodeResolve ( options ) {
 			if ( !importer ) return null;
 
 			return new Promise( ( accept, reject ) => {
-				resolveId(
-					importee,
-					{
+				var opts = {
 						basedir: dirname( importer ),
 						packageFilter ( pkg ) {
 							if ( options.jsnext ) {
@@ -54,7 +52,18 @@ export default function nodeResolve ( options ) {
 							return pkg;
 						},
 						extensions: options.extensions
-					},
+					};
+					
+				// NOTE: https://www.npmjs.com/package/browser-resolve running in Node v6+ requires
+				// opts.filename to **not** be undefined; if we are using browserResolve, ensure that option has
+				// a default configuration value for 'filename'
+				if (options.browser) {
+					opts.filename = __filename; 
+				}
+				
+				resolveId(
+					importee,
+					opts,
 					( err, resolved ) => {
 						if ( err ) {
 							if ( skip === true ) accept( false );