diff --git a/time_tracker.admin.inc b/time_tracker.admin.inc
index 93d03f2..f31c713 100644
--- a/time_tracker.admin.inc
+++ b/time_tracker.admin.inc
@@ -30,6 +30,12 @@ function time_tracker_settings_form() {
     '#description' => t("Checking this setting will allow users with the 'administer time entries' permission to lock time entries, preventing them from being editied."),
     '#default_value' => variable_get('allow_locked_time_entries', 0),
   );
+  $form['time_tracker_settings']['require_entry_notes'] = array(
+    '#type' => 'checkbox',
+    '#title' => t("Make entry notes required"),
+    '#description' => t("Checking this setting will make the notes field required on time entries."),
+    '#default_value' => variable_get('require_entry_notes', 0),
+  );
   $form['time_tracker_settings']['enable_billable_field'] = array(
     '#type' => 'checkbox',
     '#title' => t("Enable the 'Billable' field"),
diff --git a/time_tracker.install b/time_tracker.install
index a2ee016..cbb23af 100644
--- a/time_tracker.install
+++ b/time_tracker.install
@@ -134,7 +134,7 @@ function time_tracker_install() {
     ))
     ->condition('name', 'time_tracker', '=')
     ->execute();
-
+    variable_del('require_entry_notes');
   $t = get_t();
 
   drupal_set_message($t("Time Tracker has been installed successfully. To begin tracking time, you first must enable time tracking on at least one entity type. You can do so on time tracker's entity settings page at admin/config/time_tracker/entity_settings."));
diff --git a/time_tracker.module b/time_tracker.module
index ae12ccc..5f01702 100644
--- a/time_tracker.module
+++ b/time_tracker.module
@@ -1418,6 +1418,7 @@ function time_tracker_time_entry_form($form, &$form_state, $time_entry, $info =
       '#weight' => 7,
       '#rows' => 2,
       '#resizable' => FALSE,
+      '#required' => variable_get('require_entry_notes', 0),
       '#default_value' => isset($time_tracker_data->note) ? $time_tracker_data->note : '',
     );
   }