diff --git a/include/frnetlib/Socket.h b/include/frnetlib/Socket.h
index 413f95b..d84c62d 100644
--- a/include/frnetlib/Socket.h
+++ b/include/frnetlib/Socket.h
@@ -83,6 +83,16 @@ namespace fr
             return remote_address;
         }
 
+        /*!
+         * Sets the connections remote address.
+         *
+         * @param addr The remote address to use
+         */
+        void set_remote_address(const std::string &addr)
+        {
+            remote_address = addr;
+        }
+
         /*!
          * Sets the socket to blocking or non-blocking.
          *
diff --git a/include/frnetlib/TcpSocket.h b/include/frnetlib/TcpSocket.h
index a4dc83b..ff3b42b 100644
--- a/include/frnetlib/TcpSocket.h
+++ b/include/frnetlib/TcpSocket.h
@@ -67,16 +67,6 @@ public:
      */
     virtual Status receive_raw(void *data, size_t buffer_size, size_t &received) override;
 
-    /*!
-     * Sets the connections remote address.
-     *
-     * @param addr The remote address to use
-     */
-    void set_remote_address(const std::string &addr)
-    {
-        remote_address = addr;
-    }
-
     /*!
      * Sets if the socket should be blocking or non-blocking.
      *