diff --git a/src/windows-emulator/syscalls/port.cpp b/src/windows-emulator/syscalls/port.cpp
index c557c15d..32b5c0e0 100644
--- a/src/windows-emulator/syscalls/port.cpp
+++ b/src/windows-emulator/syscalls/port.cpp
@@ -4,18 +4,6 @@
 
 namespace syscalls
 {
-    struct CSR_API_CONNECTINFO
-    {
-        uint64_t SharedSectionBase;
-        uint64_t SharedStaticServerData;
-        uint64_t SharedSectionHeap;
-        ULONG DebugFlags;
-        ULONG SizeOfPebData;
-        ULONG SizeOfTebData;
-        ULONG NumberOfServerDllNames;
-        EMULATOR_CAST(uint64_t, HANDLE) ServerProcessId;
-    };
-
     NTSTATUS handle_NtConnectPort(const syscall_context& c, const emulator_object<handle> client_port_handle,
                                   const emulator_object<UNICODE_STRING<EmulatorTraits<Emu64>>> server_port_name,
                                   const emulator_object<SECURITY_QUALITY_OF_SERVICE> /*security_qos*/,
@@ -33,34 +21,9 @@ namespace syscalls
 
         if (connection_info)
         {
-            if (p.name == u"\\Windows\\ApiPort")
-            {
-                CSR_API_CONNECTINFO connect_info{};
-
-                const auto expected_connect_length = connection_info_length.read();
-                if (expected_connect_length < sizeof(CSR_API_CONNECTINFO))
-                {
-                    return STATUS_BUFFER_TOO_SMALL;
-                }
-
-                // TODO: Use client_shared_memory to get the section entry and get the address from it?
-                connect_info.SharedSectionBase = c.proc.shared_section_address;
-                c.emu.write_memory(c.proc.shared_section_address + 2504,
-                                   0xFFFFFFFF); // BaseStaticServerData->TermsrvClientTimeZoneId
-
-                const auto static_server_data =
-                    c.win_emu.memory.allocate_memory(0x10000, memory_permission::read_write);
-                connect_info.SharedStaticServerData = static_server_data;
-                c.emu.write_memory(static_server_data + 8, connect_info.SharedSectionBase);
-
-                c.emu.write_memory(connection_info, &connect_info, sizeof(connect_info));
-            }
-            else
-            {
-                std::vector<uint8_t> zero_mem{};
-                zero_mem.resize(connection_info_length.read(), 0);
-                c.emu.write_memory(connection_info, zero_mem.data(), zero_mem.size());
-            }
+            std::vector<uint8_t> zero_mem{};
+            zero_mem.resize(connection_info_length.read(), 0);
+            c.emu.write_memory(connection_info, zero_mem.data(), zero_mem.size());
         }
 
         client_shared_memory.access([&](PORT_VIEW64& view) {
diff --git a/src/windows-emulator/syscalls/section.cpp b/src/windows-emulator/syscalls/section.cpp
index ac19b486..61e935d5 100644
--- a/src/windows-emulator/syscalls/section.cpp
+++ b/src/windows-emulator/syscalls/section.cpp
@@ -143,6 +143,7 @@ namespace syscalls
             constexpr auto windows_dir_offset = 0x10;
             c.emu.write_memory(address + 8, windows_dir_offset);
 
+            // aka. BaseStaticServerData (BASE_STATIC_SERVER_DATA)
             const auto obj_address = address + windows_dir_offset;
 
             const emulator_object<UNICODE_STRING<EmulatorTraits<Emu64>>> windir_obj{c.emu, obj_address};
@@ -168,6 +169,8 @@ namespace syscalls
                 ucs.Buffer = ucs.Buffer - obj_address;
             });
 
+            c.emu.write_memory(obj_address + 0x9C8, 0xFFFFFFFF); // TIME_ZONE_ID_INVALID
+
             if (view_size)
             {
                 view_size.write(shared_section_size);