diff --git a/forena.module b/forena.module
index 97b1f5b49f1cb307eb2178814e19166632766b52..8e6042297262b632a37f4ab3672759502a5ad533 100755
--- a/forena.module
+++ b/forena.module
@@ -633,6 +633,11 @@ function forena_parameter_form($formid, &$form_state, $parameters, $attributes=
         //onto the array. options will cause an error for
         //textfield elements.
         if ($list || $type == 'select' || $type =='radios') {
+          if ($add_null) {
+            $prompt = @$options['prompt'];
+            if (!$prompt) $prompt = $required ? '-select-' : '-none-';
+            $form['params'][$id]['#empty_option'] = $prompt ;
+          }
           $form['params'][$id]['#options'] = $list;
           $form['params'][$id]['#multiple'] = $multiselect;
         }