diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce2a8210d..8306df2d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Unreleased
 
 - Fix `TypeError` in `Sentry\Monolog\Handler` when the extra data array has numeric keys (#833).
+- Changed type hint for both parameter and return value of `HubInterface::getCurrentHub` and `HubInterface::setCurrentHub()` methods (#849)
 
 ## 2.1.1 (2019-06-13)
 
diff --git a/src/State/HubInterface.php b/src/State/HubInterface.php
index af13d62e6..babeeb8a4 100644
--- a/src/State/HubInterface.php
+++ b/src/State/HubInterface.php
@@ -122,18 +122,18 @@ public function addBreadcrumb(Breadcrumb $breadcrumb): bool;
     /**
      * Returns the current global Hub.
      *
-     * @return self
+     * @return HubInterface
      */
-    public static function getCurrent(): self;
+    public static function getCurrent(): HubInterface;
 
     /**
      * Sets the Hub as the current.
      *
-     * @param self $hub The Hub that will become the current one
+     * @param HubInterface $hub The Hub that will become the current one
      *
-     * @return self
+     * @return HubInterface
      */
-    public static function setCurrent(self $hub): self;
+    public static function setCurrent(HubInterface $hub): HubInterface;
 
     /**
      * Gets the integration whose FQCN matches the given one if it's available on the current client.