diff --git a/docs/changelog.rst b/docs/changelog.rst
index e3f00945a..68c551e06 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -13,6 +13,9 @@ To update |kitty|, :doc:`follow the instructions <binary>`.
 - macOS: Prevent :kbd:`option` based shortcuts for being used for global menu
   actions (:iss:`3515`)
 
+- Fix ``kitty @ close-tab`` not working with pipe based remote control
+  (:iss:`3510`)
+
 0.20.1 [2021-04-19]
 ----------------------
 
diff --git a/kitty/rc/close_tab.py b/kitty/rc/close_tab.py
index 074363066..e00f05fb7 100644
--- a/kitty/rc/close_tab.py
+++ b/kitty/rc/close_tab.py
@@ -34,9 +34,8 @@ If specified close the tab this command is run in, rather than the active tab.
 
     def response_from_kitty(self, boss: Boss, window: Optional[Window], payload_get: PayloadGetType) -> ResponseType:
         for tab in self.tabs_for_match_payload(boss, window, payload_get):
-            if window:
-                if tab:
-                    boss.close_tab_no_confirm(tab)
+            if tab:
+                boss.close_tab_no_confirm(tab)
 
 
 close_tab = CloseTab()