diff --git a/src/misc.c b/src/misc.c
index 7e8ffbd..8597422 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -53,6 +53,7 @@ char *current_time(void)
     switch (option.timestamp)
     {
         case TIMESTAMP_NONE:
+            return NULL;
         case TIMESTAMP_24HOUR:
             // "hh:mm:ss.sss" (24 hour format)
             tv = tv_now;
diff --git a/src/options.c b/src/options.c
index b10cae8..8d552ea 100644
--- a/src/options.c
+++ b/src/options.c
@@ -105,10 +105,6 @@ const char* timestamp_token(enum timestamp_t timestamp)
 {
     switch (timestamp)
     {
-        case TIMESTAMP_NONE:
-            return "none";
-            break;
-
         case TIMESTAMP_24HOUR:
             return "24hour";
             break;
@@ -137,11 +133,7 @@ enum timestamp_t timestamp_option_parse(const char *arg)
     
     if (arg != NULL)
     {
-        if (strcmp(arg, "none") == 0)
-        {
-            return TIMESTAMP_NONE;
-        }
-        else if (strcmp(arg, "24hour") == 0)
+        if (strcmp(arg, "24hour") == 0)
         {
             return TIMESTAMP_24HOUR;
         }