diff --git a/src/formatting.js b/src/formatting.js
index 6997bd61..2a543bef 100644
--- a/src/formatting.js
+++ b/src/formatting.js
@@ -206,9 +206,9 @@ function formatByte(instance, providedFormat, state, numbro) {
     const { binarySuffixes: localBinarySuffixes, decimalSuffixes: localDecimalSuffixes } = state.currentBytes();
 
     const localBytes = {
-        general: { scale: 1024, suffixes: localDecimalSuffixes, marker: "bd" },
-        binary: { scale: 1024, suffixes: localBinarySuffixes, marker: "b" },
-        decimal: { scale: 1000, suffixes: localDecimalSuffixes, marker: "d" }
+        general: { scale: 1024, suffixes: localDecimalSuffixes || decimalSuffixes, marker: "bd" },
+        binary: { scale: 1024, suffixes: localBinarySuffixes || binarySuffixes, marker: "b" },
+        decimal: { scale: 1000, suffixes: localDecimalSuffixes || decimalSuffixes, marker: "d" }
     };
     let baseInfo = localBytes[base];
 
diff --git a/src/globalState.js b/src/globalState.js
index ece757bb..d4207592 100644
--- a/src/globalState.js
+++ b/src/globalState.js
@@ -60,7 +60,7 @@ state.currentLanguage = () => currentLanguageTag;
  *
  * @return {{}}
  */
-state.currentBytes = () => currentLanguageData().bytes;
+state.currentBytes = () => currentLanguageData().bytes || {};
 
 /**
  * Return the current language currency data