diff --git a/CHANGELOG.md b/CHANGELOG.md
index f57f0a89b24..0ed82f10ec6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 1. [12663](https://github.com/influxdata/influxdb/pull/12663): Insert flux function near cursor in flux editor
 
 ### Bug Fixes
+1. [12684](https://github.com/influxdata/influxdb/pull/12684): Fix mismatch in bucket row and header  
 
 ### UI Improvements
 
diff --git a/ui/src/organizations/components/BucketRow.tsx b/ui/src/organizations/components/BucketRow.tsx
index dd856a60b73..00f6b47381c 100644
--- a/ui/src/organizations/components/BucketRow.tsx
+++ b/ui/src/organizations/components/BucketRow.tsx
@@ -1,5 +1,6 @@
 // Libraries
 import React, {PureComponent} from 'react'
+import {withRouter, WithRouterProps} from 'react-router'
 
 // Components
 import {IndexList, ConfirmationButton, Context} from 'src/clockface'
@@ -33,7 +34,7 @@ interface Props {
   onFilterChange: (searchTerm: string) => void
 }
 
-export default class BucketRow extends PureComponent<Props> {
+class BucketRow extends PureComponent<Props & WithRouterProps> {
   public render() {
     const {bucket, onDeleteBucket} = this.props
     return (
@@ -47,7 +48,7 @@ export default class BucketRow extends PureComponent<Props> {
               noNameString={DEFAULT_BUCKET_NAME}
             />
           </IndexList.Cell>
-          <IndexList.Cell>{bucket.organization}</IndexList.Cell>
+          {this.organization}
           <IndexList.Cell>{bucket.ruleString}</IndexList.Cell>
           <IndexList.Cell revealOnHover={true} alignment={Alignment.Right}>
             <ConfirmationButton
@@ -91,6 +92,12 @@ export default class BucketRow extends PureComponent<Props> {
     )
   }
 
+  private get organization(): JSX.Element {
+    if (!this.props.params.orgID) {
+      return <IndexList.Cell>{this.props.bucket.organization}</IndexList.Cell>
+    }
+  }
+
   private handleUpdateBucketName = async (value: string) => {
     await this.props.onUpdateBucket({...this.props.bucket, name: value})
   }
@@ -111,3 +118,5 @@ export default class BucketRow extends PureComponent<Props> {
     this.props.onAddData(this.props.bucket, DataLoaderType.Scraping)
   }
 }
+
+export default withRouter<Props>(BucketRow)
diff --git a/ui/src/organizations/components/__snapshots__/Buckets.test.tsx.snap b/ui/src/organizations/components/__snapshots__/Buckets.test.tsx.snap
index 18e38906f33..a396237ce77 100644
--- a/ui/src/organizations/components/__snapshots__/Buckets.test.tsx.snap
+++ b/ui/src/organizations/components/__snapshots__/Buckets.test.tsx.snap
@@ -32,316 +32,17 @@ Object {
             </th>
           </tr>
         </thead>
-        <tbody
-          class="index-list--body"
+        <p
+          class="error"
         >
-          <tr
-            class="index-list--row"
-            data-testid="table-row"
+          An InfluxDB error has occurred. Please report the issue 
+          <a
+            href="https://github.com/influxdata/influxdb/issues"
           >
-            <td
-              class="index-list--row-cell index-list--align-left"
-            >
-              <div
-                class="index-list--cell"
-                data-testid="table-cell"
-              >
-                <div
-                  class="editable-name"
-                >
-                  <a
-                    href="#"
-                  >
-                    <span>
-                      newbuck
-                    </span>
-                  </a>
-                  <div
-                    class="editable-name--toggle"
-                    data-testid="editable-name"
-                  >
-                    <span
-                      class="icon pencil"
-                    />
-                  </div>
-                </div>
-              </div>
-            </td>
-            <td
-              class="index-list--row-cell index-list--align-left"
-            >
-              <div
-                class="index-list--cell"
-                data-testid="table-cell"
-              >
-                default
-              </div>
-            </td>
-            <td
-              class="index-list--row-cell index-list--align-left"
-            >
-              <div
-                class="index-list--cell"
-                data-testid="table-cell"
-              />
-            </td>
-            <td
-              class="index-list--row-cell index-list--show-hover index-list--align-right"
-            >
-              <div
-                class="index-list--cell"
-                data-testid="table-cell"
-              >
-                <div
-                  class="confirmation-button"
-                >
-                  <button
-                    class="button button-xs button-danger"
-                    data-testid="delete-button"
-                    tabindex="0"
-                    title="Delete"
-                    type="button"
-                  >
-                    Delete
-                  </button>
-                  <div
-                    class="confirmation-button--tooltip"
-                  >
-                    <div
-                      class="confirmation-button--tooltip-body"
-                      data-testid="confirmation-button"
-                    >
-                      Confirm
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </td>
-            <td
-              class="index-list--row-cell index-list--align-right"
-            >
-              <div
-                class="index-list--cell"
-                data-testid="table-cell"
-              >
-                <div
-                  class="context-menu"
-                >
-                  <div
-                    class="context-menu--container"
-                  >
-                    <button
-                      class="button button-xs button-primary context-menu--toggle context-menu--primary"
-                      data-testid="context-menu"
-                      tabindex="0"
-                      title="Add Data"
-                      type="button"
-                    >
-                      <span
-                        class="button-icon icon plus"
-                      />
-                      Add Data
-                    </button>
-                    <div
-                      class="context-menu--list-container"
-                    >
-                      <div
-                        class="context-menu--list context-menu--primary"
-                      >
-                        <button
-                          class="context-menu--item"
-                          data-testid="context-menu-item"
-                        >
-                          Configure Telegraf Agent
-                          <div
-                            class="contex-menu--item-description"
-                          >
-                            Configure a Telegraf agent to push data into your bucket.
-                          </div>
-                        </button>
-                        <button
-                          class="context-menu--item"
-                          data-testid="context-menu-item"
-                        >
-                          Line Protocol
-                          <div
-                            class="contex-menu--item-description"
-                          >
-                            Quickly load an existing line protocol file.
-                          </div>
-                        </button>
-                        <button
-                          class="context-menu--item"
-                          data-testid="context-menu-item"
-                        >
-                          Scrape Metrics
-                          <div
-                            class="contex-menu--item-description"
-                          >
-                            Add a scrape target to pull data into your bucket.
-                          </div>
-                        </button>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </td>
-          </tr>
-          <tr
-            class="index-list--row"
-            data-testid="table-row"
-          >
-            <td
-              class="index-list--row-cell index-list--align-left"
-            >
-              <div
-                class="index-list--cell"
-                data-testid="table-cell"
-              >
-                <div
-                  class="editable-name"
-                >
-                  <a
-                    href="#"
-                  >
-                    <span>
-                      newbuck1
-                    </span>
-                  </a>
-                  <div
-                    class="editable-name--toggle"
-                    data-testid="editable-name"
-                  >
-                    <span
-                      class="icon pencil"
-                    />
-                  </div>
-                </div>
-              </div>
-            </td>
-            <td
-              class="index-list--row-cell index-list--align-left"
-            >
-              <div
-                class="index-list--cell"
-                data-testid="table-cell"
-              >
-                default
-              </div>
-            </td>
-            <td
-              class="index-list--row-cell index-list--align-left"
-            >
-              <div
-                class="index-list--cell"
-                data-testid="table-cell"
-              />
-            </td>
-            <td
-              class="index-list--row-cell index-list--show-hover index-list--align-right"
-            >
-              <div
-                class="index-list--cell"
-                data-testid="table-cell"
-              >
-                <div
-                  class="confirmation-button"
-                >
-                  <button
-                    class="button button-xs button-danger"
-                    data-testid="delete-button"
-                    tabindex="0"
-                    title="Delete"
-                    type="button"
-                  >
-                    Delete
-                  </button>
-                  <div
-                    class="confirmation-button--tooltip"
-                  >
-                    <div
-                      class="confirmation-button--tooltip-body"
-                      data-testid="confirmation-button"
-                    >
-                      Confirm
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </td>
-            <td
-              class="index-list--row-cell index-list--align-right"
-            >
-              <div
-                class="index-list--cell"
-                data-testid="table-cell"
-              >
-                <div
-                  class="context-menu"
-                >
-                  <div
-                    class="context-menu--container"
-                  >
-                    <button
-                      class="button button-xs button-primary context-menu--toggle context-menu--primary"
-                      data-testid="context-menu"
-                      tabindex="0"
-                      title="Add Data"
-                      type="button"
-                    >
-                      <span
-                        class="button-icon icon plus"
-                      />
-                      Add Data
-                    </button>
-                    <div
-                      class="context-menu--list-container"
-                    >
-                      <div
-                        class="context-menu--list context-menu--primary"
-                      >
-                        <button
-                          class="context-menu--item"
-                          data-testid="context-menu-item"
-                        >
-                          Configure Telegraf Agent
-                          <div
-                            class="contex-menu--item-description"
-                          >
-                            Configure a Telegraf agent to push data into your bucket.
-                          </div>
-                        </button>
-                        <button
-                          class="context-menu--item"
-                          data-testid="context-menu-item"
-                        >
-                          Line Protocol
-                          <div
-                            class="contex-menu--item-description"
-                          >
-                            Quickly load an existing line protocol file.
-                          </div>
-                        </button>
-                        <button
-                          class="context-menu--item"
-                          data-testid="context-menu-item"
-                        >
-                          Scrape Metrics
-                          <div
-                            class="contex-menu--item-description"
-                          >
-                            Add a scrape target to pull data into your bucket.
-                          </div>
-                        </button>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </td>
-          </tr>
-        </tbody>
+            here
+          </a>
+          .
+        </p>
       </table>
       <div
         class="fancy-scroll--container overlay"
@@ -411,316 +112,17 @@ Object {
           </th>
         </tr>
       </thead>
-      <tbody
-        class="index-list--body"
+      <p
+        class="error"
       >
-        <tr
-          class="index-list--row"
-          data-testid="table-row"
-        >
-          <td
-            class="index-list--row-cell index-list--align-left"
-          >
-            <div
-              class="index-list--cell"
-              data-testid="table-cell"
-            >
-              <div
-                class="editable-name"
-              >
-                <a
-                  href="#"
-                >
-                  <span>
-                    newbuck
-                  </span>
-                </a>
-                <div
-                  class="editable-name--toggle"
-                  data-testid="editable-name"
-                >
-                  <span
-                    class="icon pencil"
-                  />
-                </div>
-              </div>
-            </div>
-          </td>
-          <td
-            class="index-list--row-cell index-list--align-left"
-          >
-            <div
-              class="index-list--cell"
-              data-testid="table-cell"
-            >
-              default
-            </div>
-          </td>
-          <td
-            class="index-list--row-cell index-list--align-left"
-          >
-            <div
-              class="index-list--cell"
-              data-testid="table-cell"
-            />
-          </td>
-          <td
-            class="index-list--row-cell index-list--show-hover index-list--align-right"
-          >
-            <div
-              class="index-list--cell"
-              data-testid="table-cell"
-            >
-              <div
-                class="confirmation-button"
-              >
-                <button
-                  class="button button-xs button-danger"
-                  data-testid="delete-button"
-                  tabindex="0"
-                  title="Delete"
-                  type="button"
-                >
-                  Delete
-                </button>
-                <div
-                  class="confirmation-button--tooltip"
-                >
-                  <div
-                    class="confirmation-button--tooltip-body"
-                    data-testid="confirmation-button"
-                  >
-                    Confirm
-                  </div>
-                </div>
-              </div>
-            </div>
-          </td>
-          <td
-            class="index-list--row-cell index-list--align-right"
-          >
-            <div
-              class="index-list--cell"
-              data-testid="table-cell"
-            >
-              <div
-                class="context-menu"
-              >
-                <div
-                  class="context-menu--container"
-                >
-                  <button
-                    class="button button-xs button-primary context-menu--toggle context-menu--primary"
-                    data-testid="context-menu"
-                    tabindex="0"
-                    title="Add Data"
-                    type="button"
-                  >
-                    <span
-                      class="button-icon icon plus"
-                    />
-                    Add Data
-                  </button>
-                  <div
-                    class="context-menu--list-container"
-                  >
-                    <div
-                      class="context-menu--list context-menu--primary"
-                    >
-                      <button
-                        class="context-menu--item"
-                        data-testid="context-menu-item"
-                      >
-                        Configure Telegraf Agent
-                        <div
-                          class="contex-menu--item-description"
-                        >
-                          Configure a Telegraf agent to push data into your bucket.
-                        </div>
-                      </button>
-                      <button
-                        class="context-menu--item"
-                        data-testid="context-menu-item"
-                      >
-                        Line Protocol
-                        <div
-                          class="contex-menu--item-description"
-                        >
-                          Quickly load an existing line protocol file.
-                        </div>
-                      </button>
-                      <button
-                        class="context-menu--item"
-                        data-testid="context-menu-item"
-                      >
-                        Scrape Metrics
-                        <div
-                          class="contex-menu--item-description"
-                        >
-                          Add a scrape target to pull data into your bucket.
-                        </div>
-                      </button>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </td>
-        </tr>
-        <tr
-          class="index-list--row"
-          data-testid="table-row"
+        An InfluxDB error has occurred. Please report the issue 
+        <a
+          href="https://github.com/influxdata/influxdb/issues"
         >
-          <td
-            class="index-list--row-cell index-list--align-left"
-          >
-            <div
-              class="index-list--cell"
-              data-testid="table-cell"
-            >
-              <div
-                class="editable-name"
-              >
-                <a
-                  href="#"
-                >
-                  <span>
-                    newbuck1
-                  </span>
-                </a>
-                <div
-                  class="editable-name--toggle"
-                  data-testid="editable-name"
-                >
-                  <span
-                    class="icon pencil"
-                  />
-                </div>
-              </div>
-            </div>
-          </td>
-          <td
-            class="index-list--row-cell index-list--align-left"
-          >
-            <div
-              class="index-list--cell"
-              data-testid="table-cell"
-            >
-              default
-            </div>
-          </td>
-          <td
-            class="index-list--row-cell index-list--align-left"
-          >
-            <div
-              class="index-list--cell"
-              data-testid="table-cell"
-            />
-          </td>
-          <td
-            class="index-list--row-cell index-list--show-hover index-list--align-right"
-          >
-            <div
-              class="index-list--cell"
-              data-testid="table-cell"
-            >
-              <div
-                class="confirmation-button"
-              >
-                <button
-                  class="button button-xs button-danger"
-                  data-testid="delete-button"
-                  tabindex="0"
-                  title="Delete"
-                  type="button"
-                >
-                  Delete
-                </button>
-                <div
-                  class="confirmation-button--tooltip"
-                >
-                  <div
-                    class="confirmation-button--tooltip-body"
-                    data-testid="confirmation-button"
-                  >
-                    Confirm
-                  </div>
-                </div>
-              </div>
-            </div>
-          </td>
-          <td
-            class="index-list--row-cell index-list--align-right"
-          >
-            <div
-              class="index-list--cell"
-              data-testid="table-cell"
-            >
-              <div
-                class="context-menu"
-              >
-                <div
-                  class="context-menu--container"
-                >
-                  <button
-                    class="button button-xs button-primary context-menu--toggle context-menu--primary"
-                    data-testid="context-menu"
-                    tabindex="0"
-                    title="Add Data"
-                    type="button"
-                  >
-                    <span
-                      class="button-icon icon plus"
-                    />
-                    Add Data
-                  </button>
-                  <div
-                    class="context-menu--list-container"
-                  >
-                    <div
-                      class="context-menu--list context-menu--primary"
-                    >
-                      <button
-                        class="context-menu--item"
-                        data-testid="context-menu-item"
-                      >
-                        Configure Telegraf Agent
-                        <div
-                          class="contex-menu--item-description"
-                        >
-                          Configure a Telegraf agent to push data into your bucket.
-                        </div>
-                      </button>
-                      <button
-                        class="context-menu--item"
-                        data-testid="context-menu-item"
-                      >
-                        Line Protocol
-                        <div
-                          class="contex-menu--item-description"
-                        >
-                          Quickly load an existing line protocol file.
-                        </div>
-                      </button>
-                      <button
-                        class="context-menu--item"
-                        data-testid="context-menu-item"
-                      >
-                        Scrape Metrics
-                        <div
-                          class="contex-menu--item-description"
-                        >
-                          Add a scrape target to pull data into your bucket.
-                        </div>
-                      </button>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </td>
-        </tr>
-      </tbody>
+          here
+        </a>
+        .
+      </p>
     </table>
     <div
       class="fancy-scroll--container overlay"