diff --git a/ui/src/core/xibo-cms.js b/ui/src/core/xibo-cms.js
index 6f3d81278f..0a65856cd7 100644
--- a/ui/src/core/xibo-cms.js
+++ b/ui/src/core/xibo-cms.js
@@ -164,7 +164,7 @@ window.XiboInitialise = function(scope, options) {
     });
 
   // Form validation
-  $(scope + ' .XiboForm').each((_idx, form) => {
+  $(scope + ' .XiboForm:not(.custom-validation)').each((_idx, form) => {
     const $form = $(form);
     forms.validateForm(
       $form, // form
diff --git a/views/dataset-form-add.twig b/views/dataset-form-add.twig
index 2ae534d19c..3c4e76eafb 100644
--- a/views/dataset-form-add.twig
+++ b/views/dataset-form-add.twig
@@ -45,7 +45,7 @@
                 <li class="nav-item tabForRemoteDataSet"><a class="nav-link" href="#data" role="tab" data-toggle="tab"><span>{% trans "Data" %}</span></a></li>
                 <li class="nav-item tabForRemoteDataSet"><a class="nav-link" href="#params" role="tab" data-toggle="tab"><span>{% trans "Advanced" %}</span></a></li>
             </ul>
-            <form id="dataSetAddForm" class="XiboForm form-horizontal" method="post" action="{{ url_for("dataSet.add") }}">
+            <form id="dataSetAddForm" class="XiboForm custom-validation form-horizontal" method="post" action="{{ url_for("dataSet.add") }}">
                 <div class="tab-content">
                     <div class="tab-pane active" id="general">
 
diff --git a/views/dataset-form-edit.twig b/views/dataset-form-edit.twig
index 9efc893586..c6db3dd624 100644
--- a/views/dataset-form-edit.twig
+++ b/views/dataset-form-edit.twig
@@ -45,7 +45,7 @@
                 <li class="nav-item tabForRemoteDataSet"><a class="nav-link" href="#data" role="tab" data-toggle="tab"><span>{% trans "Data" %}</span></a></li>
                 <li class="nav-item tabForRemoteDataSet"><a class="nav-link" href="#params" role="tab" data-toggle="tab"><span>{% trans "Advanced" %}</span></a></li>
             </ul>
-            <form id="dataSetEditForm" class="XiboForm form-horizontal" method="put" action="{{ url_for("dataSet.edit", {id: dataSet.dataSetId}) }}">
+            <form id="dataSetEditForm" class="XiboForm custom-validation form-horizontal" method="put" action="{{ url_for("dataSet.edit", {id: dataSet.dataSetId}) }}">
                 <input type="hidden" name="testDataSetId" value="{{ dataSet.dataSetId }}"/>
                 <div class="tab-content">
                     <div class="tab-pane active" id="general">
diff --git a/views/dataset-page.twig b/views/dataset-page.twig
index 6f0fef51fe..969177d94a 100644
--- a/views/dataset-page.twig
+++ b/views/dataset-page.twig
@@ -353,6 +353,26 @@
             $(dialog).find('#sourceId').on('change', function() {
                 onSourceFieldChanged(dialog);
             });
+
+            // Validate form manually because
+            // uri field depends on isRemote being checked
+            if (forms != undefined) {
+                const $form = $(dialog).find('form');
+                forms.validateForm(
+                    $form, // form
+                    $form.parent(), // container
+                    {
+                        submitHandler: XiboFormSubmit,
+                        rules: {
+                            uri: {
+                                required: function(element) {
+                                    return $form.find('#isRemote').is(':checked')
+                                },
+                            },
+                        },
+                    },
+                );
+            }
         }
 
         function onIsRealTimeFieldChanged(dialog) {