diff --git a/Source/NETworkManager.Models/Network/Whois.cs b/Source/NETworkManager.Models/Network/Whois.cs
index 76984e3fc1..fc10e107fc 100644
--- a/Source/NETworkManager.Models/Network/Whois.cs
+++ b/Source/NETworkManager.Models/Network/Whois.cs
@@ -73,7 +73,7 @@ public static string GetWhoisServer(string domain)
         var domainParts = domain.Split('.');
 
         // TLD to upper because the lookup is case sensitive
-        return WhoisServers[domainParts[domainParts.Length - 1].ToUpper()].FirstOrDefault()?.Server;
+        return WhoisServers[domainParts[^1].ToUpper()].FirstOrDefault()?.Server;
     }
     #endregion
 }
diff --git a/docs/Changelog/next-release.md b/docs/Changelog/next-release.md
index b989b9fd09..36448787f5 100644
--- a/docs/Changelog/next-release.md
+++ b/docs/Changelog/next-release.md
@@ -36,4 +36,5 @@ Deprecated
 - Language files updated [#transifex](https://github.com/BornToBeRoot/NETworkManager/pulls?q=author%3Aapp%2Ftransifex-integration){:target="\_blank"}
 - Dependencies updated [#dependencies](https://github.com/BornToBeRoot/NETworkManager/pulls?q=author%3Aapp%2Fdependabot){:target="\_blank"}
 - Add documentation for:
+  - Application > Whois [#2236](https://github.com/BornToBeRoot/NETworkManager/pull/2236)
   - Application > Subnet Calculator [#2233](https://github.com/BornToBeRoot/NETworkManager/pull/2233)
diff --git a/docs/Documentation/01_Application/04_IPScanner.md b/docs/Documentation/01_Application/04_IPScanner.md
index 977883329e..a9fe3ac7e8 100644
--- a/docs/Documentation/01_Application/04_IPScanner.md
+++ b/docs/Documentation/01_Application/04_IPScanner.md
@@ -42,7 +42,7 @@ Inherit the host from the general settings.
 
 **Type:** `Boolean`
 
-**Default:** `Disabled`
+**Default:** `Enabled`
 
 {: .note }
 If you enable this option, the [IP range](#ip-range) is overwritten by the host from the general settings and the [IP range](#ip-range) is disabled.
diff --git a/docs/Documentation/01_Application/19_Whois.md b/docs/Documentation/01_Application/19_Whois.md
index 3c158e4921..9cc002a3a9 100644
--- a/docs/Documentation/01_Application/19_Whois.md
+++ b/docs/Documentation/01_Application/19_Whois.md
@@ -4,12 +4,48 @@ title: Whois
 parent: Application
 grand_parent: Documentation
 nav_order: 19
-description: ""
+description: "Documentation of Whois"
 permalink: /Documentation/Application/Whois
 ---
 
 # Whois
 
+With **Whois** you can retrieve Whois information for a domain directly from the Whois server associated with the top-level domain.
+
+{: .information }
+Whois data from a domain is publicly available. The data is provided by the domain registrar and can be queried via the whois protocol. The whois protocol is based on TCP and uses port 43. The whois protocol is not encrypted and the data is transmitted in plain text. Because the whois protocol is not standardized, the data may have a different format depending on the registrar.
+
+{: .note}
+In order to use the whois protocol, the firewall must allow outgoing connections on port 43 to the whois server associated with the top-level domain. For example, if you want to query the whois information for `example.com`, you must allow outgoing connections to `whois.verisign-grs.com` on port 43.
+
+{: .note}
+For .de domains, DENIC no longer provides information via the whois protocol.
+
+Possible inputs:
+
+- `example.com`
+
 ![Whois](19_Whois.png)
 
-## Profile
\ No newline at end of file
+## Profile
+
+### Inherit host from general
+
+Inherit the host from the general settings.
+
+**Type:** `Boolean`
+
+**Default:** `Enabled`
+
+{: .note }
+If you enable this option, the [domain](#domain) is overwritten by the host from the general settings and the [domain](#domain) is disabled.
+
+### Domain
+
+Domain to query for whois information.
+
+**Type:** `String`
+
+**Default:** `Empty`
+
+**Example:** `example.com`