diff --git a/owrx/feature.py b/owrx/feature.py
index bcb73d2b..92c03e57 100644
--- a/owrx/feature.py
+++ b/owrx/feature.py
@@ -61,6 +61,7 @@ class FeatureDetector(object):
         "perseussdr": ["perseustest", "nmux"],
         "airspy": ["soapy_connector", "soapy_airspy"],
         "airspyhf": ["soapy_connector", "soapy_airspyhf"],
+        "afedri": ["soapy_connector", "soapy_afedri"],
         "lime_sdr": ["soapy_connector", "soapy_lime_sdr"],
         "fifi_sdr": ["alsa", "rockprog", "nmux"],
         "pluto_sdr": ["soapy_connector", "soapy_pluto_sdr"],
@@ -344,6 +345,14 @@ class FeatureDetector(object):
         """
         return self._has_soapy_driver("airspyhf")
 
+    def has_soapy_afedri(self):
+        """
+        The SoapyAfedri module allows using Afedri SDR-Net devices with SoapySDR.
+
+        You can get it [here](https://github.com/alexander-sholohov/SoapyAfedri).
+        """
+        return self._has_soapy_driver("afedri")
+
     def has_soapy_lime_sdr(self):
         """
         The Lime Suite installs - amongst others - a Soapy driver for the LimeSDR device series.
diff --git a/owrx/source/afedri.py b/owrx/source/afedri.py
new file mode 100644
index 00000000..258555ac
--- /dev/null
+++ b/owrx/source/afedri.py
@@ -0,0 +1,87 @@
+from owrx.source.soapy import SoapyConnectorSource, SoapyConnectorDeviceDescription
+from owrx.form.input import Input, TextInput, NumberInput, CheckboxInput
+from owrx.form.input.device import RemoteInput
+from owrx.form.input.converter import OptionalConverter
+from owrx.form.input.validator import RangeValidator
+from typing import List
+
+
+AFEDRI_DEVICE_KEYS = ["rx_mode", "force_set_channel"]
+
+
+class AfedriSource(SoapyConnectorSource):
+
+    def getSoapySettingsMappings(self):
+        mappings = super().getSoapySettingsMappings()
+        mappings.update(
+            {
+                "r820t_lna_agc": "r820t_lna_agc",
+                "r820t_mixer_agc": "r820t_mixer_agc",
+            }
+        )
+        return mappings
+
+    def getEventNames(self):
+        return super().getEventNames() + ["remote"] + AFEDRI_DEVICE_KEYS
+
+    def getDriver(self):
+        return "afedri"
+
+    def buildSoapyDeviceParameters(self, parsed, values):
+        params = super().buildSoapyDeviceParameters(parsed, values)
+        params = [v for v in params if not "remote" in params]
+        remote = values["remote"]
+        address, port = remote.split(":")
+        params += [{"address": address, "port": port}]
+
+        can_be_set_at_start = AFEDRI_DEVICE_KEYS
+        for elm in can_be_set_at_start:
+            if elm in values:
+                params += [{elm: values[elm]}]
+
+        return params
+
+
+class AfedriDeviceDescription(SoapyConnectorDeviceDescription):
+    def getName(self):
+        return "Afedri device"
+
+    def supportsPpm(self):
+        # not currently mapped, and it's unclear how this should be sent to the device
+        return False
+
+    def hasAgc(self):
+        # not currently mapped
+        return False
+
+    def getInputs(self) -> List[Input]:
+        return super().getInputs() + [
+            RemoteInput(),
+            NumberInput("current_channel_for_settings", "Afedri: Current channel for settings.", validator=RangeValidator(0, 4)),
+            CheckboxInput("r820t_lna_agc", "Afedri: Enable R820T LNA AGC"),
+            CheckboxInput("r820t_mixer_agc", "Afedri: Enable R820T Mixer AGC"),
+            NumberInput("force_set_channel", "Afedri: Use this channel instead of default when connect to master seed server.", "Number in range [0,3]", validator=RangeValidator(0, 3)),
+            # NumberInput("channels_overload_mode", "Afedri: Overload mode for channels.", "Number in range [0,15]. One bit for each channel. 4 bits in total.", validator=RangeValidator(0, 15)),
+            # NumberInput("rx_mode", "Afedri: RX Mode (Single/Dual/Quad Channel)", "Number in range [0,5]. Switch device to specific RX mode. (Single/DualDiversity/Dual/DiversityInternal/QuadDiversity/Quad)", validator=RangeValidator(0, 15)),
+        ]
+
+    def getDeviceMandatoryKeys(self):
+        return super().getDeviceMandatoryKeys() + ["remote"]
+
+    def getDeviceOptionalKeys(self):
+        items_to_remove = []
+        res = super().getDeviceOptionalKeys()
+        res = [x for x in super().getProfileOptionalKeys() if x not in items_to_remove]
+        res += AFEDRI_DEVICE_KEYS
+        return res
+
+    def getProfileOptionalKeys(self):
+        items_to_remove = []
+        res = [x for x in super().getProfileOptionalKeys() if x not in items_to_remove]
+        res.append("r820t_lna_agc")
+        res.append("r820t_mixer_agc")
+        return res
+
+    def getGainStages(self):
+        return ["RF", "FE", "R820T_LNA_GAIN", "R820T_MIXER_GAIN", "R820T_VGA_GAIN"]
+