diff --git a/src/frontend/inpcom.c b/src/frontend/inpcom.c
index 0b707d7b3..edfe6399b 100644
--- a/src/frontend/inpcom.c
+++ b/src/frontend/inpcom.c
@@ -6107,10 +6107,11 @@ static char *get_quoted_token(char *string, char **token)
         return string;
 
     if (isquote(*s)) {
-
+        /* we may find single ' or double " quotes */
+        char thisquote = *s;
         char *t = ++s;
 
-        while (*t && !isquote(*t))
+        while (*t && !(*t == thisquote))
             t++;
 
         if (!*t) { /* teriminator quote not found */