diff --git a/android/src/main/java/com/facebook/flipper/nativeplugins/table/TableRow.java b/android/src/main/java/com/facebook/flipper/nativeplugins/table/TableRow.java
index 6404e4754..8967180cb 100644
--- a/android/src/main/java/com/facebook/flipper/nativeplugins/table/TableRow.java
+++ b/android/src/main/java/com/facebook/flipper/nativeplugins/table/TableRow.java
@@ -92,7 +92,7 @@ public abstract class TableRow {
     columnsObject.put("id", id);
     return new FlipperObject.Builder()
         .put("columns", columnsObject.build())
-        .put("sidebar", sidebar.serialize())
+        .put("sidebar", sidebar != null ? sidebar.serialize() : null)
         .put("id", id)
         .build();
   }
diff --git a/src/plugins/TableNativePlugin.js b/src/plugins/TableNativePlugin.js
index a4acade62..405cc13ad 100644
--- a/src/plugins/TableNativePlugin.js
+++ b/src/plugins/TableNativePlugin.js
@@ -199,7 +199,7 @@ function renderToolbar(section: ToolbarSection) {
 
 function renderSidebarForRow(rowData: RowData): Node {
   if (!rowData.sidebar) {
-    throw new Error('renderSidebar used with missing rowData.sidebar');
+    return null;
   }
   if (!Array.isArray(rowData.sidebar)) {
     throw new Error('typeof rowData.sidebar is not array as expected: ');