diff --git a/plugins/pinotjdbc/connectionBuilder.js b/plugins/pinotjdbc/connectionBuilder.js
index c2f453d..6bcda80 100644
--- a/plugins/pinotjdbc/connectionBuilder.js
+++ b/plugins/pinotjdbc/connectionBuilder.js
@@ -11,7 +11,7 @@
  * specific language governing permissions and limitations under the License.
  */
 (function dsbuilder(attr) {
-    const urlBuilder = "jdbc:pinot://" + attr[connectionHelper.attributeServer] + ":" + attr[connectionHelper.attributePort] + "?enableNullHandling=true";
+    const urlBuilder = "jdbc:pinot://" + attr[connectionHelper.attributeServer] + ":" + attr[connectionHelper.attributePort];
 
     return [urlBuilder];
 })
diff --git a/plugins/pinotjdbc/connectionFields.xml b/plugins/pinotjdbc/connectionFields.xml
index 80b8de0..57199b0 100644
--- a/plugins/pinotjdbc/connectionFields.xml
+++ b/plugins/pinotjdbc/connectionFields.xml
@@ -68,6 +68,6 @@
     </boolean-options>
   </field>
   
-  <field name="v-additional-properties" label="Additional Properties" value-type="textbox" category="advanced" placeholder="Optional - Enter additional properties as key=value pairs on separate lines" optional="true" />
+  <field name="v-additional-properties" label="Additional Properties" value-type="textbox" category="advanced" placeholder="Optional - Enter additional properties as key=value pairs on separate lines" default-value="enableNullHandling=true" optional="true" />
 
 </connection-fields>
diff --git a/plugins/pinotjdbc/manifest.xml b/plugins/pinotjdbc/manifest.xml
index 0822271..cc0761e 100644
--- a/plugins/pinotjdbc/manifest.xml
+++ b/plugins/pinotjdbc/manifest.xml
@@ -13,7 +13,7 @@
     specific language governing permissions and limitations under the License.
 
 -->
-<connector-plugin class='pinot' superclass='jdbc' plugin-version='1.0.0' name='Apache Pinot' version='18.1' min-version-tableau='2021.1'>
+<connector-plugin class='pinot' superclass='jdbc' plugin-version='1.0.1' name='Apache Pinot' version='18.1' min-version-tableau='2021.1'>
   <vendor-information>
       <company name="StarTree"/>
       <support-link url="https://github.com/apache/pinot/issues"/>