From 468cae6041ce69114059a65989d887d479e16e5e Mon Sep 17 00:00:00 2001
From: atanasster <atanasster@gmail.com>
Date: Fri, 10 Jul 2020 21:26:17 -0400
Subject: [PATCH] fix: check for null options

---
 ui/blocks/src/context/block/BlockContext.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ui/blocks/src/context/block/BlockContext.tsx b/ui/blocks/src/context/block/BlockContext.tsx
index 7b99ac33f..195b58651 100644
--- a/ui/blocks/src/context/block/BlockContext.tsx
+++ b/ui/blocks/src/context/block/BlockContext.tsx
@@ -82,7 +82,9 @@ export const BlockContextProvider: React.FC<BlockContextInputProps> = ({
               storyId,
               docId: propsDocId,
               storeProvider: store,
-              options: deepMerge(options, store.config),
+              options: store.config
+                ? deepMerge(options, store.config)
+                : options,
             }}
           >
             <BlockDataContextProvider