diff --git a/forecastmanager/migrations/0009_alter_forecastdataparameters_parameter_unit.py b/forecastmanager/migrations/0009_alter_forecastdataparameters_parameter_unit.py
new file mode 100644
index 0000000..98b7f27
--- /dev/null
+++ b/forecastmanager/migrations/0009_alter_forecastdataparameters_parameter_unit.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.2 on 2023-08-15 08:25
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('forecastmanager', '0008_alter_forecastdataparameters_parameter_unit'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='forecastdataparameters',
+            name='parameter_unit',
+            field=models.CharField(blank=True, default=' ', help_text='e.g °C, %, mm, hPa, etc ', max_length=100, null=True, verbose_name='Unit of measurement'),
+        ),
+    ]
diff --git a/forecastmanager/site_settings.py b/forecastmanager/site_settings.py
index 18b8a37..b9d9ab5 100644
--- a/forecastmanager/site_settings.py
+++ b/forecastmanager/site_settings.py
@@ -63,7 +63,7 @@ def data_parameter_values(self):
         data_parameters = self.data_parameters.all()
         params = []
         for param in data_parameters:
-            params.append({"parameter": param.parameter, "name": param.name, "parameter_type": param.parameter_type, "parameter_unit":param.parameter_unit})
+            params.append({"parameter": param.parameter, "name": param.name, "parameter_type": param.parameter_type, "parameter_unit":param.parameter_unit if param.parameter_unit else " " })
         return params
 
 
diff --git a/forecastmanager/templates/forecastmanager/view_forecast.html b/forecastmanager/templates/forecastmanager/view_forecast.html
index 6e4d9a6..e07d1e4 100644
--- a/forecastmanager/templates/forecastmanager/view_forecast.html
+++ b/forecastmanager/templates/forecastmanager/view_forecast.html
@@ -228,7 +228,7 @@ <h2 class="w-panel__heading" style="margin-bottom: 20px">{% trans 'Latest Availa
             const getPopupHTML = (props) => {
                 const paramValues = dataParams.reduce((all, param) => {
                     if (props[param.parameter]) {
-                        all[param.name] = props[param.parameter]
+                        all[param.name] = `${props[param.parameter]} ${param.parameter_unit}`
                     }
                     return all
                 }, {})
diff --git a/setup.cfg b/setup.cfg
index 99512a2..306f449 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = forecastmanager
-version = 0.1.6
+version = 0.1.7
 description = Integration of Weather City Forecasts Manager in Wagtail Projects.
 long_description = file:README.md
 long_description_content_type = text/markdown